diff --git a/python-setuptools.spec b/python-setuptools.spec
index 290456b..a2ebd93 100644
--- a/python-setuptools.spec
+++ b/python-setuptools.spec
@@ -2,13 +2,11 @@
 
 #  WARNING  When bootstrapping, disable tests as well,
 #           because tests need pip.
-# Bootstrapping does not affect the platform-python-setuptools subpackage
 %bcond_with bootstrap
 %bcond_without tests
 
 %bcond_without python2
 %bcond_without python3
-%bcond_without platform_python
 
 %if ! 0%{?fedora}
 # disable Python 3 if not Fedora
@@ -32,7 +30,7 @@
 
 Name:           python-setuptools
 Version:        36.2.0
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Easily build and distribute Python packages
 
 Group:          Applications/System
@@ -73,14 +71,6 @@ BuildRequires:  python3-wheel
 %endif # without bootstrap
 %endif # with python3
 
-%if %{with platform_python}
-BuildRequires:  platform-python-devel
-BuildRequires:  platform-python-libs-devel
-%if %{with tests}
-BuildRequires:  platform-python-pytest
-%endif # with tests
-%endif # with platform_python
-
 # We're now back to setuptools as the package.
 # Keep the python-distribute name active for a few releases.  Eventually we'll
 # want to get rid of the Provides and just keep the Obsoletes
@@ -117,6 +107,7 @@ execute the software that requires pkg_resources.py.
 Summary:        Easily build and distribute Python 3 packages
 Group:          Applications/System
 %{?python_provide:%python_provide python3-setuptools}
+Obsoletes:      platform-python-setuptools < %{version}-%{release}
 
 %description -n python3-setuptools
 Setuptools is a collection of enhancements to the Python 3 distutils that allow
@@ -129,22 +120,6 @@ execute the software that requires pkg_resources.py.
 %endif # with python3
 
 
-%if %{with platform_python}
-%package -n platform-python-setuptools
-Summary:        Easily build and distribute Python 3 packages
-Group:          Applications/System
-
-%description -n platform-python-setuptools
-Setuptools is a collection of enhancements to the Python 3 distutils that allow
-you to more easily build and distribute Python 3 packages, especially ones that
-have dependencies on other packages.
-
-This package also contains the runtime components of setuptools, necessary to
-execute the software that requires pkg_resources.py.
-
-%endif # with platform_python
-
-
 %prep
 %setup -q -n %{srcname}-%{version}
 
@@ -187,28 +162,11 @@ rm setuptools/tests/test_integration.py
 %endif
 %endif # with python3
 
-%if %{with platform_python}
-# Platform Python build does not need to build the wheel
-%platform_py_build
-%endif # with platform_python
-
 
 %install
-# Must do the platform-python and python3 install first because the scripts in
-# /usr/bin are overwritten with every setup.py install (and we want the python2
-# version to be the default for now).
-%if %{with platform_python}
-%platform_py_install
-
-# Delete all executables under /usr/bin, we don't want them for platform-python
-rm %{buildroot}%{_bindir}/*
-
-rm -rf %{buildroot}%{platform_python_sitelib}/setuptools/tests
-
-find %{buildroot}%{platform_python_sitelib} -name '*.exe' | xargs rm -f
-%endif # with platform_python
-
-
+# Must do the python3 install first because the scripts in /usr/bin are
+# overwritten with every setup.py install (and we want the python2 version to
+# be the default for now).
 %if %{with python3}
 %if %{without bootstrap}
 %py3_install_wheel %{python3_wheelname}
@@ -260,10 +218,6 @@ rm -r docs/{Makefile,conf.py,_*}
 %if %{with python3}
 LANG=en_US.utf8 PYTHONPATH=$(pwd) py.test-%{python3_version}
 %endif # with python3
-
-%if %{with platform_python}
-LANG=en_US.utf8 PYTHONPATH=$(pwd) %{__platform_python} -m pytest
-%endif # with platform_python
 %endif # with tests
 
 
@@ -287,18 +241,11 @@ LANG=en_US.utf8 PYTHONPATH=$(pwd) %{__platform_python} -m pytest
 %{_bindir}/easy_install-3.*
 %endif # with python3
 
-%if %{with platform_python}
-%files -n platform-python-setuptools
-%license LICENSE
-%doc docs/* CHANGES.rst README.rst
-%{platform_python_sitelib}/easy_install.py
-%{platform_python_sitelib}/pkg_resources/
-%{platform_python_sitelib}/setuptools*/
-%{platform_python_sitelib}/__pycache__/*
-%endif # with platform_python
-
 
 %changelog
+* Thu Nov 09 2017 Tomas Orsava <torsava@redhat.com> - 36.2.0-8
+- Remove the platform-python subpackage
+
 * Sun Aug 20 2017 Tomas Orsava <torsava@redhat.com> - 36.2.0-7
 - Re-enable tests to finish bootstrapping the platform-python stack
   (https://fedoraproject.org/wiki/Changes/Platform_Python_Stack)