Revert "Try to clean up the build a bit."

This reverts commit 7d9b53722ae5a2289dd65c417328595e8029c9a6.