Reverted several merges