Revert "Tweaking of compiler optimizations"

This reverts commit 2476c6ac60725b35c0d6f561e20fa31611275ae0.