Revert "Compiler optimizations"

This reverts commit c3ff0d4484de9b17489fd63c5bc7cab8d3f0100e.