diff --git a/lib/galaxy/datatypes/metadata.py b/lib/galaxy/datatypes/metadata.py
index fe2c3a5aff3..4efa692dc8c 100644
--- a/lib/galaxy/datatypes/metadata.py
+++ b/lib/galaxy/datatypes/metadata.py
@@ -772,10 +772,10 @@ class JobExternalOutputMetadataWrapper( object ):
             #return command required to build
             fd, fp = tempfile.mkstemp( suffix='.py', dir = tmp_dir, prefix = "set_metadata_" )
             metadata_script_file = abspath( fp )
-            os.fdopen( fd, 'w' ).write( 'from galaxy_utils.metadata.set_metadata import set_metadata; set_metadata()' )
+            os.fdopen( fd, 'w' ).write( 'from galaxy.metadata.set_metadata import set_metadata; set_metadata()' )
             return "python %s %s" % ( metadata_script_file, args )
         else:
-            # return args to galaxy_utils.metadata.set_metadata required to build
+            # return args to galaxy.metadata.set_metadata required to build
             return args
 
     def external_metadata_set_successfully( self, dataset, sa_session ):
diff --git a/lib/galaxy/datatypes/registry.py b/lib/galaxy/datatypes/registry.py
index 10514bf6ac2..1f362bbd922 100644
--- a/lib/galaxy/datatypes/registry.py
+++ b/lib/galaxy/datatypes/registry.py
@@ -652,7 +652,7 @@ class Registry( object ):
                 <param name="__SET_EXTERNAL_METADATA_COMMAND_LINE__" type="hidden" value=""/>
               </inputs>
               <configfiles>
-                <configfile name="set_metadata">from galaxy_utils.metadata.set_metadata import set_metadata; set_metadata()</configfile>
+                <configfile name="set_metadata">from galaxy.metadata.set_metadata import set_metadata; set_metadata()</configfile>
               </configfiles>
             </tool>
             """
diff --git a/lib/galaxy_utils/metadata/__init__.py b/lib/galaxy/metadata/__init__.py
similarity index 100%
rename from lib/galaxy_utils/metadata/__init__.py
rename to lib/galaxy/metadata/__init__.py
diff --git a/lib/galaxy_utils/metadata/set_metadata.py b/lib/galaxy/metadata/set_metadata.py
similarity index 97%
rename from lib/galaxy_utils/metadata/set_metadata.py
rename to lib/galaxy/metadata/set_metadata.py
index e5741a9bfb0..0ffcb35d92a 100644
--- a/lib/galaxy_utils/metadata/set_metadata.py
+++ b/lib/galaxy/metadata/set_metadata.py
@@ -33,10 +33,6 @@ import galaxy.model.mapping  # need to load this before we unpickle, in order to
 galaxy.model.Job()  # this looks REAL stupid, but it is REQUIRED in order for SA to insert parameters into the classes defined by the mappers --> it appears that instantiating ANY mapper'ed class would suffice here
 from galaxy.util import stringify_dictionary_keys
 from sqlalchemy.orm import clear_mappers
-from galaxy.objectstore import build_object_store_from_config
-from galaxy import config
-import ConfigParser
-from galaxy.util.properties import load_app_properties
 
 
 def set_meta_with_tool_provided( dataset_instance, file_dict, set_meta_kwds ):