Revert commits pending CR