Revert O3 optimization