Fixup: Removed code which was covered by regen_metadata()