Revert faulty merges