diff --git a/lib/rdoc/code_object/class_module.rb b/lib/rdoc/code_object/class_module.rb
index 9e6909ac7d..c2ad779b7a 100644
--- a/lib/rdoc/code_object/class_module.rb
+++ b/lib/rdoc/code_object/class_module.rb
@@ -634,7 +634,7 @@ def parse comment_location
   # Path to this class or module for use with HTML generator output.
 
   def path
-    http_url @store.rdoc.generator.class_dir
+    http_url
   end
 
   ##
diff --git a/lib/rdoc/code_object/context.rb b/lib/rdoc/code_object/context.rb
index c688d562c3..061eb47ad3 100644
--- a/lib/rdoc/code_object/context.rb
+++ b/lib/rdoc/code_object/context.rb
@@ -973,10 +973,10 @@ def fully_documented?
   ##
   # URL for this with a +prefix+
 
-  def http_url(prefix)
+  def http_url
     path = name_for_path
     path = path.gsub(/<<\s*(\w*)/, 'from-\1') if path =~ /<</
-    path = [prefix] + path.split('::')
+    path = path.split('::')
 
     File.join(*path.compact) + '.html'
   end
diff --git a/lib/rdoc/code_object/top_level.rb b/lib/rdoc/code_object/top_level.rb
index 57091ba08b..b97ca7deb3 100644
--- a/lib/rdoc/code_object/top_level.rb
+++ b/lib/rdoc/code_object/top_level.rb
@@ -173,10 +173,8 @@ def hash
   ##
   # URL for this with a +prefix+
 
-  def http_url(prefix)
-    path = [prefix, @relative_name.tr('.', '_')]
-
-    File.join(*path.compact) + '.html'
+  def http_url
+    @relative_name.tr('.', '_') + '.html'
   end
 
   def inspect # :nodoc:
@@ -246,7 +244,7 @@ def page_name
   # Path to this file for use with HTML generator output.
 
   def path
-    http_url @store.rdoc.generator.file_dir
+    http_url
   end
 
   def pretty_print q # :nodoc:
diff --git a/lib/rdoc/generator/darkfish.rb b/lib/rdoc/generator/darkfish.rb
index 45795eb78e..e4e20831f3 100644
--- a/lib/rdoc/generator/darkfish.rb
+++ b/lib/rdoc/generator/darkfish.rb
@@ -184,22 +184,6 @@ def debug_msg *msg
     $stderr.puts(*msg)
   end
 
-  ##
-  # Directory where generated class HTML files live relative to the output
-  # dir.
-
-  def class_dir
-    nil
-  end
-
-  ##
-  # Directory where generated class HTML files live relative to the output
-  # dir.
-
-  def file_dir
-    nil
-  end
-
   ##
   # Create the directories the generated docs will live in if they don't
   # already exist.
diff --git a/lib/rdoc/generator/json_index.rb b/lib/rdoc/generator/json_index.rb
index c454910d5c..6404cbb312 100644
--- a/lib/rdoc/generator/json_index.rb
+++ b/lib/rdoc/generator/json_index.rb
@@ -86,9 +86,7 @@ class RDoc::Generator::JsonIndex
   attr_reader :index # :nodoc:
 
   ##
-  # Creates a new generator.  +parent_generator+ is used to determine the
-  # class_dir and file_dir of links in the output index.
-  #
+  # Creates a new generator.
   # +options+ are the same options passed to the parent generator.
 
   def initialize parent_generator, options
@@ -265,20 +263,6 @@ def index_pages
     end
   end
 
-  ##
-  # The directory classes are written to
-
-  def class_dir
-    @parent_generator.class_dir
-  end
-
-  ##
-  # The directory files are written to
-
-  def file_dir
-    @parent_generator.file_dir
-  end
-
   def reset files, classes # :nodoc:
     @files   = files
     @classes = classes
diff --git a/lib/rdoc/generator/pot.rb b/lib/rdoc/generator/pot.rb
index b0b7c07179..6ceca16640 100644
--- a/lib/rdoc/generator/pot.rb
+++ b/lib/rdoc/generator/pot.rb
@@ -81,11 +81,6 @@ def generate
     end
   end
 
-  # :nodoc:
-  def class_dir
-    nil
-  end
-
   private
   def extract_messages
     extractor = MessageExtractor.new(@store)
diff --git a/test/rdoc/support/test_case.rb b/test/rdoc/support/test_case.rb
index de5885ee02..fcdc514424 100644
--- a/test/rdoc/support/test_case.rb
+++ b/test/rdoc/support/test_case.rb
@@ -53,10 +53,7 @@ def setup
     @rdoc.store = @store
     @rdoc.options = RDoc::Options.new
 
-    g = Object.new
-    def g.class_dir() end
-    def g.file_dir() end
-    @rdoc.generator = g
+    @rdoc.generator = Object.new
 
     RDoc::Markup::PreProcess.reset
   end
diff --git a/test/rdoc/test_rdoc_generator_json_index.rb b/test/rdoc/test_rdoc_generator_json_index.rb
index 71b5cd969a..8a50deab89 100644
--- a/test/rdoc/test_rdoc_generator_json_index.rb
+++ b/test/rdoc/test_rdoc_generator_json_index.rb
@@ -80,14 +80,6 @@ def test_build_index
     assert_equal expected, index
   end
 
-  def test_class_dir
-    assert_equal @darkfish.class_dir, @g.class_dir
-  end
-
-  def test_file_dir
-    assert_equal @darkfish.file_dir, @g.file_dir
-  end
-
   def test_generate
     @g.generate
 
diff --git a/test/rdoc/test_rdoc_top_level.rb b/test/rdoc/test_rdoc_top_level.rb
index a9f2b232e9..5e5861d07f 100644
--- a/test/rdoc/test_rdoc_top_level.rb
+++ b/test/rdoc/test_rdoc_top_level.rb
@@ -156,10 +156,10 @@ def test_hash
   end
 
   def test_http_url
-    assert_equal 'prefix/path/top_level_rb.html', @top_level.http_url('prefix')
+    assert_equal 'path/top_level_rb.html', @top_level.http_url
 
     other_level = @store.add_file 'path.other/level.rb'
-    assert_equal 'prefix/path_other/level_rb.html', other_level.http_url('prefix')
+    assert_equal 'path_other/level_rb.html', other_level.http_url
   end
 
   def test_last_modified
diff --git a/test/rdoc/xref_test_case.rb b/test/rdoc/xref_test_case.rb
index 9c0b7129aa..2daba10232 100644
--- a/test/rdoc/xref_test_case.rb
+++ b/test/rdoc/xref_test_case.rb
@@ -30,8 +30,6 @@ def setup
     @top_levels.push @example_md
 
     generator = Object.new
-    def generator.class_dir() nil end
-    def generator.file_dir() nil end
     @rdoc.options = @options
     @rdoc.generator = generator