Revert "revert Faster build"

This reverts commit 7020246aedd5fb77f5fef04c22f7195d7cca4024.