Revert "Build fixes"