Revert "Bug 7947: Store MappingOrigin in MappingData"