diff --git a/lib/rubygems/command.rb b/lib/rubygems/command.rb
index 4b32376954..347b36cae6 100644
--- a/lib/rubygems/command.rb
+++ b/lib/rubygems/command.rb
@@ -20,6 +20,10 @@ class Gem::Command
 
   include Gem::UserInteraction
 
+  OptionParser.accept Symbol do |value|
+    value.to_sym
+  end
+
   ##
   # The name of the command.
 
diff --git a/lib/rubygems/gemcutter_utilities.rb b/lib/rubygems/gemcutter_utilities.rb
index e68784bb67..21f83e72d1 100644
--- a/lib/rubygems/gemcutter_utilities.rb
+++ b/lib/rubygems/gemcutter_utilities.rb
@@ -9,11 +9,6 @@ module Gem::GemcutterUtilities
 
   include Gem::Text
 
-  # TODO: move to Gem::Command
-  OptionParser.accept Symbol do |value|
-    value.to_sym
-  end
-
   attr_writer :host
 
   ##