Revert back the metadata factory