Merge "Fixing the build for real." into jb-dev