diff --git a/elements/pip-and-virtualenv-override/README.md b/elements/pip-and-virtualenv-override/README.md
new file mode 100644
index 000000000..de8ffd5a9
--- /dev/null
+++ b/elements/pip-and-virtualenv-override/README.md
@@ -0,0 +1,4 @@
+This element will override the behavior from the pip-and-virtualenv element
+from tripleo-image-elements so that python-pip and python-virtualenv are never
+installed.
+
diff --git a/elements/pip-and-virtualenv-override/element-provides b/elements/pip-and-virtualenv-override/element-provides
new file mode 100644
index 000000000..7c8922a0b
--- /dev/null
+++ b/elements/pip-and-virtualenv-override/element-provides
@@ -0,0 +1 @@
+pip-and-virtualenv
diff --git a/elements/undercloud-install/pre-install.d/01-pbr b/elements/undercloud-install/pre-install.d/01-pbr
deleted file mode 100755
index cc2a12d86..000000000
--- a/elements/undercloud-install/pre-install.d/01-pbr
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-set -eux
-
-install-packages python-pbr
diff --git a/json-files/rhel-7-rhos-6-undercloud-packages.json b/json-files/rhel-7-rhos-6-undercloud-packages.json
index 470085052..95e1a4756 100644
--- a/json-files/rhel-7-rhos-6-undercloud-packages.json
+++ b/json-files/rhel-7-rhos-6-undercloud-packages.json
@@ -56,7 +56,8 @@
     ],
     "exclude-element": [
       "dkms",
-      "openvswitch-datapath"
+      "openvswitch-datapath",
+      "pip-and-virtualenv"
     ],
     "blacklist": [
       "10-cloud-init",
diff --git a/scripts/instack-build-images b/scripts/instack-build-images
index 4f46a5ce0..1d6f319c4 100755
--- a/scripts/instack-build-images
+++ b/scripts/instack-build-images
@@ -54,7 +54,7 @@ fi
 
 export PACKAGES=${PACKAGES:-"1"}
 if [ "$PACKAGES" = "1" ]; then
-    export DIB_COMMON_ELEMENTS="$DIB_COMMON_ELEMENTS tripleo-image-elements undercloud-package-install"
+    export DIB_COMMON_ELEMENTS="$DIB_COMMON_ELEMENTS tripleo-image-elements undercloud-package-install pip-and-virtualenv-override"
 fi
 
 export OVERCLOUD_CONTROL_DIB_EXTRA_ARGS=${OVERCLOUD_CONTROL_DIB_EXTRA_ARGS:-"\
diff --git a/scripts/instack-install-undercloud b/scripts/instack-install-undercloud
index 992b29ca5..af6d70c28 100755
--- a/scripts/instack-install-undercloud
+++ b/scripts/instack-install-undercloud
@@ -17,9 +17,9 @@ else
 fi
 
 export ELEMENTS_PATH=${ELEMENTS_PATH:-"\
+/usr/share/instack-undercloud:\
 /usr/share/tripleo-image-elements:\
-/usr/share/diskimage-builder/elements:\
-/usr/share/instack-undercloud"}
+/usr/share/diskimage-builder/elements"}
 
 echo "Sourcing answers file from instack.answers..."
 source ~/instack.answers