Reverted some incorrect merges