diff --git a/requirements.txt b/requirements.txt
index 07d74c51..4de34990 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,10 +1,4 @@
 colorama
-passlib
-
-[:python_version<'3']
-ipaddr>=2.1.11
 dnspython
-
-[:python_version>='3']
-ipaddress
-dnspython3
+ipaddr>=2.1.11; python_version<'3'
+passlib
diff --git a/setup.py b/setup.py
index 7738292d..f052bccb 100644
--- a/setup.py
+++ b/setup.py
@@ -15,22 +15,6 @@ def read(fname):
     return open(os.path.join(os.path.dirname(__file__), fname)).read()
 
 
-## Comment out for Github issue #127
-## Conditionally require the correct ipaddr package in Python2 vs Python3
-#if sys.version_info[0]<3:
-#    IPADDR = "ipaddr>=2.1.11"
-#    DNSPYTHON = "dnspython"
-#else:
-#    IPADDR = "ipaddress"
-#    DNSPYTHON = "dnspython3"
-
-# Ref Github issue #127 - sdist improvements
-REQUIRES = ['colorama', 'passlib']
-EXTRAS = {
-    ":python_version<'3'": ['ipaddr>=2.1.11', 'dnspython'],
-    ":python_version>'3.0'": ['ipaddress', 'dnspython3'],
-}
-
 setup(name='ciscoconfparse',
       version=open(os.path.join(os.path.dirname(os.path.abspath(__file__)),
           'ciscoconfparse', 'version')).read().strip(),
@@ -47,8 +31,13 @@ def read(fname):
       packages=find_packages(),
       use_2to3=True,             # Reqd for Windows + Py3 - ref Github issue #32
       zip_safe=False,
-      install_requires = REQUIRES,
-      extras_require = EXTRAS, # Conditional dependencies Github isssue #127
+      install_requires=[
+          'colorama',
+          'passlib',
+          ],
+      extras_require={           # Conditional dependencies Github isssue #127
+          ":python_version<'3'": ['ipaddr>=2.1.11'],
+          },
       #setup_requires=["setuptools_hg"],  # setuptools_hg must be installed as a python module
       classifiers=[
           'Development Status :: 5 - Production/Stable',