Reverted previous merge