Revert had -O3 optimizations