diff --git a/Makefile b/Makefile
index 84e8fcbc11..a4f861cd71 100644
--- a/Makefile
+++ b/Makefile
@@ -663,7 +663,6 @@ docker-compose-build: awx-devel-build
 # Base development image build
 awx-devel-build:
 	docker build -t ansible/awx_devel -f tools/docker-compose/Dockerfile \
-		--cache-from=$(DEV_DOCKER_TAG_BASE)/awx_devel:devel \
 		--cache-from=$(DEV_DOCKER_TAG_BASE)/awx_devel:$(COMPOSE_TAG) .
 	docker tag ansible/awx_devel $(DEV_DOCKER_TAG_BASE)/awx_devel:$(COMPOSE_TAG)
 	#docker push $(DEV_DOCKER_TAG_BASE)/awx_devel:$(COMPOSE_TAG)
diff --git a/awx/main/utils/encryption.py b/awx/main/utils/encryption.py
index 94c7389f01..3725243a8e 100644
--- a/awx/main/utils/encryption.py
+++ b/awx/main/utils/encryption.py
@@ -82,6 +82,7 @@ def encrypt_field(instance, field_name, ask=False, subfield=None, secret_key=Non
     # symmetric key is based):
     #
     # $ awx-manage regenerate_secret_key
+    # $ setup.sh -k
     #
     # ...so you'll need to *also* add code to support the
     # migration/re-encryption of these values (the code in question lives in