diff --git a/sphinx/texinputs/sphinx.sty b/sphinx/texinputs/sphinx.sty
index bb247664a5..364b571eb9 100644
--- a/sphinx/texinputs/sphinx.sty
+++ b/sphinx/texinputs/sphinx.sty
@@ -454,13 +454,7 @@
 % class method ----------------------------------------------------------
 % \begin{classmethoddesc}[classname]{methodname}{args}
 \newcommand{\classmethodline}[3][\@undefined]{
-  \classmethodlineni{#2}{#3}
-  \ifx\@undefined#1\relax
-    \index{#2@{\py@idxcode{#2()}} (\py@thisclass\ class method)}
-  \else
-    \index{#2@{\py@idxcode{#2()}} (#1 class method)}
-  \fi
-}
+  \py@sigline{class \bfcode{#2}}{#3}}
 \newenvironment{classmethoddesc}[3][\@undefined]{
   \begin{fulllineitems}
     \ifx\@undefined#1\relax
@@ -471,15 +465,6 @@
     \fi
 }{\end{fulllineitems}}
 
-% similar to {classmethoddesc}, but doesn't add to the index
-% (never actually uses the optional argument)
-\newcommand{\classmethodlineni}[3][\py@classbadkey]{%
-  \py@sigline{class \bfcode{#2}}{#3}}
-\newenvironment{classmethoddescni}[3][\py@classbadkey]{
-  \begin{fulllineitems}
-    \classmethodlineni{#2}{#3}
-}{\end{fulllineitems}}
-
 % object data attribute --------------------------------------------------
 % \begin{memberdesc}[classname]{membername}
 \newcommand{\memberline}[2][\py@classbadkey]{%