Reverse accidental(?) disabling of check before saving metadata

Fix a problem caught in code review. Suspect this change was made just for debugging
and checked in by mistake.