Revert "Add more optimizations to global build"

This reverts commit 9c769d8ef31e870f493f1cc161a27b341311538c.