Manually moving over changes that were present in the NetNewsWire
subtree as they didn't want to push over.