revert O3 commit