Revert merge