Reverted bad merge