Revert "O3 optimization"

This reverts commit e6103ae302157f7c7e117997fa8a97051f80d8f9.