diff --git a/hgext3rd/bundle2hooks.py b/hgext3rd/bundle2hooks.py
deleted file mode 100644
--- a/hgext3rd/bundle2hooks.py
+++ /dev/null
@@ -1,51 +0,0 @@
-# bundle2hooks.py - fix bundle2's support for hooks prior to lock acquisition.
-#
-# Copyright 2012 Facebook
-#
-# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2 or any later version.
-
-'''Hooks arguments are typically stored on the transaction object.  However, we
-may want to add hooks arguments without starting a transaction.  This allows us
-to queue hook arguments on the bundle2 operation object.
-
-'''
-
-from __future__ import absolute_import
-
-from mercurial import bundle2
-from mercurial import error
-from mercurial.i18n import _
-
-from hgext3rd.extutil import replaceclass
-
-def reposetup(ui, repo):
-    @replaceclass(bundle2, 'bundleoperation')
-    class bundleoperationhooked(bundle2.bundleoperation):
-        def __init__(self, repo, transactiongetter, *args, **kwargs):
-            def gettransaction():
-                transaction = transactiongetter()
-
-                if self.hookargs is not None:
-                    # the ones added to the transaction supercede those added
-                    # to the operation.
-                    self.hookargs.update(transaction.hookargs)
-                    transaction.hookargs = self.hookargs
-
-                    # mark the hookargs as flushed.  further attempts to add to
-                    # hookargs will result in an abort.
-                    self.hookargs = None
-
-                return transaction
-
-            super(bundleoperationhooked, self).__init__(repo, gettransaction,
-                                                        *args, **kwargs)
-
-            self.hookargs = {}
-
-        def addhookargs(self, hookargs):
-            if self.hookargs is None:
-                raise error.Abort(
-                    _('attempted to add hooks to operation after transaction '
-                      'started'))
-            self.hookargs.update(hookargs)
diff --git a/tests/test-pull-createmarkers-hide-later.t b/tests/test-pull-createmarkers-hide-later.t
--- a/tests/test-pull-createmarkers-hide-later.t
+++ b/tests/test-pull-createmarkers-hide-later.t
@@ -19,7 +19,6 @@
   > strip=
   > rebase=
   > remotenames =
-  > bundle2hooks=$TESTDIR/../hgext3rd/bundle2hooks.py
   > pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
   > pullcreatemarkers= $TESTDIR/../hgext3rd/pullcreatemarkers.py
   > [fbamend]
diff --git a/tests/test-pull-createmarkers.t b/tests/test-pull-createmarkers.t
--- a/tests/test-pull-createmarkers.t
+++ b/tests/test-pull-createmarkers.t
@@ -19,7 +19,6 @@
   > strip=
   > rebase=
   > remotenames =
-  > bundle2hooks=$TESTDIR/../hgext3rd/bundle2hooks.py
   > pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
   > pullcreatemarkers= $TESTDIR/../hgext3rd/pullcreatemarkers.py
   > [remotenames]
diff --git a/tests/test-pushrebase-fastmanifest.t b/tests/test-pushrebase-fastmanifest.t
--- a/tests/test-pushrebase-fastmanifest.t
+++ b/tests/test-pushrebase-fastmanifest.t
@@ -14,7 +14,6 @@
   $ cd server
   $ cat >> .hg/hgrc << EOF
   > [extensions]
-  > bundle2hooks=$TESTDIR/../hgext3rd/bundle2hooks.py
   > pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
   > EOF
   $ echo foo > a
@@ -31,7 +30,6 @@
   $ cd client1
   $ cat >> .hg/hgrc << EOF
   > [extensions]
-  > bundle2hooks=$TESTDIR/../hgext3rd/bundle2hooks.py
   > pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
   > EOF
   $ cd ..
@@ -42,7 +40,6 @@
   $ cd client2
   $ cat >> .hg/hgrc << EOF
   > [extensions]
-  > bundle2hooks=$TESTDIR/../hgext3rd/bundle2hooks.py
   > pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
   > fastmanifest=$TESTDIR/../fastmanifest
   > EOF
diff --git a/tests/test-pushrebase-manifests.t b/tests/test-pushrebase-manifests.t
--- a/tests/test-pushrebase-manifests.t
+++ b/tests/test-pushrebase-manifests.t
@@ -35,7 +35,6 @@
   >   echo "[experimental]" >> .hg/hgrc
   >   echo "bundle2lazylocking=True" >> .hg/hgrc
   >   echo "[extensions]" >> .hg/hgrc
-  >   echo "bundle2hooks =" >> .hg/hgrc
   >   echo "pushrebase =" >> .hg/hgrc
   > }
 
diff --git a/tests/test-pushrebase-protection.t b/tests/test-pushrebase-protection.t
--- a/tests/test-pushrebase-protection.t
+++ b/tests/test-pushrebase-protection.t
@@ -17,7 +17,6 @@
   $ cd server
   $ cat >> .hg/hgrc <<EOF
   > [extensions]
-  > bundle2hooks=$TESTDIR/../hgext3rd/bundle2hooks.py
   > pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
   > [pushrebase]
   > blocknonpushrebase = True
@@ -55,7 +54,7 @@
 
 Pushrebase pushes should be allowed
 
-  $ hg push --config "extensions.bundle2hooks=$TESTDIR/../hgext3rd/bundle2hooks.py" --config "extensions.pushrebase=$TESTDIR/../hgext3rd/pushrebase.py" --to master -B master
+  $ hg push --config "extensions.pushrebase=$TESTDIR/../hgext3rd/pushrebase.py" --to master -B master
   pushing to $TESTTMP/server (glob)
   searching for changes
   pushing 1 changeset:
diff --git a/tests/test-pushrebase-remotenames.t b/tests/test-pushrebase-remotenames.t
--- a/tests/test-pushrebase-remotenames.t
+++ b/tests/test-pushrebase-remotenames.t
@@ -16,7 +16,6 @@
   $ cd server
   $ cat >> .hg/hgrc << EOF
   > [extensions]
-  > bundle2hooks=$TESTDIR/../hgext3rd/bundle2hooks.py
   > pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
   > remotenames = !
   > [experimental]
@@ -43,7 +42,6 @@
   $ cat >> .hg/hgrc << EOF
   > [extensions]
   > remotenames =
-  > bundle2hooks=$TESTDIR/../hgext3rd/bundle2hooks.py
   > pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
   > [remotenames]
   > allownonfastforward=True
@@ -244,7 +242,6 @@
   $ cd forcepushserver
   $ cat >> .hg/hgrc <<EOF
   > [extensions]
-  > bundle2hooks=$TESTDIR/../hgext3rd/bundle2hooks.py
   > pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
   > remotenames = !
   > [experimental]
@@ -261,7 +258,6 @@
   $ cd ../forcepushclient
   $ cat >> .hg/hgrc <<EOF
   > [extensions]
-  > bundle2hooks=$TESTDIR/../hgext3rd/bundle2hooks.py
   > pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
   > remotenames =
   > [remotenames]
@@ -300,7 +296,6 @@
   $ cd trackingserver
   $ cat >> .hg/hgrc <<EOF
   > [extensions]
-  > bundle2hooks=$TESTDIR/../hgext3rd/bundle2hooks.py
   > pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
   > remotenames = !
   > [experimental]
@@ -313,7 +308,6 @@
   $ cd trackingclient
   $ cat >> .hg/hgrc <<EOF
   > [extensions]
-  > bundle2hooks=$TESTDIR/../hgext3rd/bundle2hooks.py
   > pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
   > remotenames =
   > [remotenames]
@@ -353,7 +347,6 @@
   $ cd oldserver
   $ cat >> .hg/hgrc <<EOF
   > [extensions]
-  > bundle2hooks=$TESTDIR/../hgext3rd/bundle2hooks.py
   > remotenames =
   > [experimental]
   > bundle2-exp=True
@@ -365,7 +358,6 @@
   $ cd newclient
   $ cat >> .hg/hgrc <<EOF
   > [extensions]
-  > bundle2hooks=$TESTDIR/../hgext3rd/bundle2hooks.py
   > pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
   > remotenames =
   > [experimental]
@@ -400,7 +392,6 @@
   $ cd pushrebaseserver
   $ cat >> .hg/hgrc <<EOF
   > [extensions]
-  > bundle2hooks=$TESTDIR/../hgext3rd/bundle2hooks.py
   > remotenames =
   > pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
   > [experimental]
@@ -415,7 +406,6 @@
   $ cd remotenamesonlyclient
   $ cat >> .hg/hgrc <<EOF
   > [extensions]
-  > bundle2hooks=$TESTDIR/../hgext3rd/bundle2hooks.py
   > pushrebase=!
   > remotenames =
   > [experimental]
diff --git a/tests/test-pushrebase.t b/tests/test-pushrebase.t
--- a/tests/test-pushrebase.t
+++ b/tests/test-pushrebase.t
@@ -35,7 +35,6 @@
   $ hg clone ssh://user@dummy/server client -q
   $ cd client
   $ echo "[extensions]" >> .hg/hgrc
-  $ echo "bundle2hooks =" >> .hg/hgrc
   $ echo "pushrebase =" >> .hg/hgrc
 
 Without server extension
@@ -84,7 +83,6 @@
 
   $ cd ../server
   $ echo "[extensions]" >> .hg/hgrc
-  $ echo "bundle2hooks =" >> .hg/hgrc
   $ echo "pushrebase =" >> .hg/hgrc
   $ log
   @  a => bar [draft:add0c792bfce]
@@ -531,7 +529,6 @@
   > [hooks]
   > prepushrebase = $TESTTMP/prerebase.sh
   > [extensions]
-  > bundle2hooks=$TESTDIR/../hgext3rd/bundle2hooks.py
   > pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
   > [experimental]
   > bundle2lazylocking = True
@@ -551,7 +548,6 @@
   $ cd prepushrebaseclient
   $ cat >> .hg/hgrc <<EOF
   > [extensions]
-  > bundle2hooks=$TESTDIR/../hgext3rd/bundle2hooks.py
   > pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
   > EOF
   $ touch b && hg add b && hg commit -qm b
@@ -589,7 +585,6 @@
   > prepushrebase = python "$RUNTESTDIR/printenv.py" prepushrebase
   > prepushkey = python "$RUNTESTDIR/printenv.py" prepushkey
   > [extensions]
-  > bundle2hooks=$TESTDIR/../hgext3rd/bundle2hooks.py
   > pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
   > EOF
   $ touch file && hg ci -Aqm initial
@@ -608,7 +603,6 @@
   $ cd hookclient
   $ cat >> .hg/hgrc <<EOF
   > [extensions]
-  > bundle2hooks=$TESTDIR/../hgext3rd/bundle2hooks.py
   > pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
   > EOF
   $ hg update master
@@ -646,7 +640,6 @@
   $ cd rewritedate
   $ cat >> .hg/hgrc <<EOF
   > [extensions]
-  > bundle2hooks=$TESTDIR/../hgext3rd/bundle2hooks.py
   > pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
   > [pushrebase]
   > rewritedates = True
@@ -662,7 +655,6 @@
   $ cd rewritedateclient
   $ cat >> .hg/hgrc <<EOF
   > [extensions]
-  > bundle2hooks=$TESTDIR/../hgext3rd/bundle2hooks.py
   > pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
   > EOF
   $ hg up 0
@@ -735,7 +727,6 @@
   $ cd p2mergeserver
   $ cat >> .hg/hgrc <<EOF
   > [extensions]
-  > bundle2hooks=$TESTDIR/../hgext3rd/bundle2hooks.py
   > pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
   > EOF
   $ echo a >> a && hg commit -Aqm 'add a'
@@ -792,7 +783,6 @@
   $ cd forcepushserver
   $ cat >> .hg/hgrc <<EOF
   > [extensions]
-  > bundle2hooks=$TESTDIR/../hgext3rd/bundle2hooks.py
   > pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
   > EOF
   $ echo a > a && hg commit -Aqm a
@@ -807,7 +797,6 @@
   $ cd ../forcepushclient
   $ cat >> .hg/hgrc <<EOF
   > [extensions]
-  > bundle2hooks=$TESTDIR/../hgext3rd/bundle2hooks.py
   > pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
   > EOF
   $ hg up 0
@@ -845,8 +834,6 @@
 phase is updated correctly with the marker information.
 
   $ cat >> $HGRCPATH << EOF
-  > [extensions]
-  > bundle2hooks=$TESTDIR/../hgext3rd/bundle2hooks.py
   > [experimental]
   > evolution =
   > EOF
diff --git a/tests/test-pushvars-remotenames.t b/tests/test-pushvars-remotenames.t
--- a/tests/test-pushvars-remotenames.t
+++ b/tests/test-pushvars-remotenames.t
@@ -13,7 +13,6 @@
   $ chmod +x $TESTTMP/pretxnchangegroup.sh
   $ cat >> $HGRCPATH << EOF
   > [extensions]
-  > bundle2hooks=$TESTDIR/../hgext3rd/bundle2hooks.py
   > pushvars=$TESTDIR/../hgext3rd/pushvars.py
   > remotenames=
   > [hooks]
diff --git a/tests/test-pushvars.t b/tests/test-pushvars.t
--- a/tests/test-pushvars.t
+++ b/tests/test-pushvars.t
@@ -12,7 +12,6 @@
   $ chmod +x $TESTTMP/pretxnchangegroup.sh
   $ cat >> $HGRCPATH << EOF
   > [extensions]
-  > bundle2hooks=$TESTDIR/../hgext3rd/bundle2hooks.py
   > pushvars=$TESTDIR/../hgext3rd/pushvars.py
   > [hooks]
   > pretxnchangegroup = $TESTTMP/pretxnchangegroup.sh
diff --git a/tests/test-treemanifest-pushrebase.t b/tests/test-treemanifest-pushrebase.t
--- a/tests/test-treemanifest-pushrebase.t
+++ b/tests/test-treemanifest-pushrebase.t
@@ -36,7 +36,6 @@
 
   $ cat >> $HGRCPATH <<EOF
   > [extensions]
-  > bundle2hooks=$TESTDIR/../hgext3rd/bundle2hooks.py
   > pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
   > [experimental]
   > bundle2lazylocking=True
diff --git a/tests/test-treemanifest-server.t b/tests/test-treemanifest-server.t
--- a/tests/test-treemanifest-server.t
+++ b/tests/test-treemanifest-server.t
@@ -7,7 +7,6 @@
   $ cd master
   $ cat >> .hg/hgrc <<EOF
   > [extensions]
-  > bundle2hooks=$TESTDIR/../hgext3rd/bundle2hooks.py
   > pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
   > treemanifest=$TESTDIR/../treemanifest
   > [treemanifest]