Remove some of the pointless but numerous differences from upstream