diff -Nru python-autobahn-17.10.1+dfsg1/debian/changelog python-autobahn-17.10.1+dfsg1/debian/changelog
--- python-autobahn-17.10.1+dfsg1/debian/changelog	2019-09-10 10:10:34.000000000 +0000
+++ python-autobahn-17.10.1+dfsg1/debian/changelog	2019-09-29 23:54:50.000000000 +0000
@@ -1,3 +1,9 @@
+python-autobahn (17.10.1+dfsg1-6+rpi1) bullseye-staging; urgency=medium
+
+  * Revert python 2 removal for now.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Sun, 29 Sep 2019 23:54:50 +0000
+
 python-autobahn (17.10.1+dfsg1-6) unstable; urgency=medium
 
   * Removed Python 2 support (Closes: #937590).
diff -Nru python-autobahn-17.10.1+dfsg1/debian/control python-autobahn-17.10.1+dfsg1/debian/control
--- python-autobahn-17.10.1+dfsg1/debian/control	2019-09-10 10:10:34.000000000 +0000
+++ python-autobahn-17.10.1+dfsg1/debian/control	2019-09-29 23:54:16.000000000 +0000
@@ -7,12 +7,35 @@
 Build-Depends:
  debhelper-compat (= 10),
  dh-python,
- openstack-pkg-tools (>= 99~),
- python3-sphinx,
- python3-sphinx-rtd-theme,
+ openstack-pkg-tools,
+ python-all,
+ python-setuptools,
+ python-sphinx,
+ python-sphinx-rtd-theme,
  python3-all,
  python3-setuptools,
 Build-Depends-Indep:
+ python-cbor (>= 1.0.0),
+ python-concurrent.futures,
+ python-enchant,
+ python-lz4,
+ python-mock,
+ python-nacl,
+ python-openssl,
+ python-pyqrcode,
+ python-pytest,
+ python-service-identity,
+ python-six,
+ python-snappy,
+ python-trie,
+ python-trollius,
+ python-twisted,
+ python-txaio,
+ python-u-msgpack,
+ python-ubjson,
+ python-unittest2,
+ python-wsaccel,
+ python-zope.interface,
  python3-cbor (>= 1.0.0),
  python3-enchant,
  python3-lz4,
@@ -37,6 +60,41 @@
 Vcs-Git: https://salsa.debian.org/openstack-team/python/python-autobahn.git
 Homepage: http://autobahn.ws/python
 
+Package: python-autobahn
+Architecture: all
+Depends:
+ python-cbor (>= 1.0.0),
+ python-concurrent.futures,
+ python-lz4,
+ python-nacl,
+ python-openssl,
+ python-pyqrcode,
+ python-service-identity,
+ python-six,
+ python-snappy,
+ python-trie,
+ python-trollius,
+ python-twisted,
+ python-txaio,
+ python-u-msgpack,
+ python-ubjson,
+ python-wsaccel,
+ python-zope.interface,
+ ${misc:Depends},
+ ${python:Depends},
+Description: WebSocket client and server library, WAMP framework - Python 2.x
+ Autobahn|Python is a networking library that is part of the Autobahn project
+ and provides implementations of:
+  * The WebSocket Protocol
+  * The Web Application Messaging Protocol (WAMP)
+ for Twisted and asyncio, on Python 2 & 3 and for writing servers and clients.
+ .
+ WebSocket allows bidirectional real-time messaging on the Web and WAMP adds
+ asynchronous Remote Procedure Calls and Publish & Subscribe on top of
+ WebSocket.
+ .
+ This package contains the Python 2.x module.
+
 Package: python3-autobahn
 Architecture: all
 Depends:
diff -Nru python-autobahn-17.10.1+dfsg1/debian/rules python-autobahn-17.10.1+dfsg1/debian/rules
--- python-autobahn-17.10.1+dfsg1/debian/rules	2019-09-10 10:10:34.000000000 +0000
+++ python-autobahn-17.10.1+dfsg1/debian/rules	2019-09-29 23:54:16.000000000 +0000
@@ -4,22 +4,14 @@
 include /usr/share/openstack-pkg-tools/pkgos.make
 
 %:
-	dh $@ --buildsystem=python_distutils --with python3
-
-override_dh_auto_clean:
-	rm -rf build .stestr
-	find . -iname '*.pyc' -delete
-	for i in $$(find . -type d -iname __pycache__) ; do rm -rf $$i ; done
-
-override_dh_auto_build:
-	echo "Do nothing..."
+	dh $@ --buildsystem=python_distutils --with python2,python3
 
 override_dh_auto_install:
-	pkgos-dh_auto_install --no-py2
+	pkgos-dh_auto_install
 
 override_dh_auto_test:
 ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
-	set -e ; set -x ; for i in $(PYTHON3S) ; do \
+	set -e ; set -x ; for i in 2.7 $(PYTHON3S) ; do \
 		rm -rf build ; \
 		PYTHONPATH=. python$$i -m pytest autobahn ; \
 	done
@@ -28,3 +20,14 @@
 override_dh_clean:
 	dh_clean -O--buildsystem=python_distutils
 	rm -rf build twisted/plugins/dropin.cache
+
+
+# Commands not to run
+override_dh_installcatalogs:
+override_dh_installemacsen override_dh_installifupdown:
+override_dh_installinfo override_dh_installmenu override_dh_installmime:
+override_dh_installmodules override_dh_installlogcheck:
+override_dh_installpam override_dh_installppp override_dh_installudev override_dh_installwm:
+override_dh_installxfonts override_dh_gconf override_dh_icons override_dh_perl override_dh_usrlocal:
+override_dh_installcron override_dh_installdebconf:
+override_dh_installlogrotate override_dh_installgsettings: