Reverted merge