Created by: johnpangalos
This is a copy of mymattcarroll's fix to #5369
I decided to put this up as a pull request now because the tests were failing and I was having trouble running the docker e2e locally.
I will also take into consideration the comments left on that PR.