Revert "A couple of changes for the build"
It's not....

This reverts commit ee37a012e8d671abf41f9cddc657e88534c74a87.