Revert changes to metadatamgmt.pp for now