diff --git a/.gitmodules b/.gitmodules
index 71e82dd7da..f80f41daf7 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -24,6 +24,3 @@
 [submodule "pype/modules/ftrack/python2_vendor/backports.functools_lru_cache"]
 	path = pype/modules/ftrack/python2_vendor/backports.functools_lru_cache
 	url = git@github.com:PythonBackports/backports.functools_lru_cache.git
-[submodule "pype/modules/ftrack/python2_vendor/python-future"]
-	path = pype/modules/ftrack/python2_vendor/python-future
-	url = git@github.com:PythonCharmers/python-future.git
diff --git a/pype/modules/ftrack/python2_vendor/builtins/__init__.py b/pype/modules/ftrack/python2_vendor/builtins/__init__.py
new file mode 100644
index 0000000000..4f936f2844
--- /dev/null
+++ b/pype/modules/ftrack/python2_vendor/builtins/__init__.py
@@ -0,0 +1,12 @@
+from __future__ import absolute_import
+import sys
+__future_module__ = True
+
+if sys.version_info[0] < 3:
+    from __builtin__ import *
+    # Overwrite any old definitions with the equivalent future.builtins ones:
+    from future.builtins import *
+else:
+    raise ImportError('This package should not be accessible on Python 3. '
+                      'Either you are trying to run from the python-future src folder '
+                      'or your installation of python-future is corrupted.')
diff --git a/pype/modules/ftrack/python2_vendor/python-future b/pype/modules/ftrack/python2_vendor/python-future
deleted file mode 160000
index 4657ad23de..0000000000
--- a/pype/modules/ftrack/python2_vendor/python-future
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 4657ad23de79a541ebcc7a06f1b9ad60172ad3c4