Revert merge commit