Revert hard -O3 optimizations