Revert "Compiler optimizations"

This reverts commit 9254dfd44da1e19cabc1a52349d1dd57e5999821.