One last tweak - turn off saveOriginalMetadata