diff --git a/doc/source/conf.py b/doc/source/conf.py
index 71909b7c..a6eb2c4b 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -43,10 +43,6 @@ extensions = ['sphinx.ext.autodoc',
               'sphinx.ext.todo',
               'sphinx.ext.coverage',
               'sphinx.ext.intersphinx',
-              # NOTE(blk-u): Uncomment the [pbr] section in setup.cfg and
-              # remove this Sphinx extension when
-              # https://launchpad.net/bugs/1260495 is fixed.
-              'ext.apidoc',
               'oslosphinx',
               'oslo_config.sphinxconfiggen'
              ]
diff --git a/setup.cfg b/setup.cfg
index dff4e89c..96b31045 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -45,6 +45,10 @@ source-dir = doc/source
 build-dir = doc/build
 all_files = 1
 
+[pbr]
+autodoc_tree_index_modules = True
+autodoc_tree_excludes = setup.py
+
 [upload_sphinx]
 upload-dir = doc/build/html