Revert my change to clone named metadata. Buildbots are complaining.