Revert "Build Optimizations (Squash)"

This reverts commit 41286460bb18a2f51d3d6b0286eddb37c39b8e0a.