Revert "Fix O3 Compiler"

This reverts commit e2ac4e9af8734342f604f05c672dc20c1f51d72e.