Revert before merge