Revert "Trying to speed up builds"

This reverts commit 61565ac8bf8cea9cc887d23bf2707a984e1f4a8e.