Added ProcessingMachine and OriginatingMachine headers back, fixes #2219