Revert "Compiler optimizations"

This reverts commit 55ad066723ae9d58e87dcdb277341f364b9a259a.