548d2b387a
This broke multiple zuul deployments. Please do not make changes without having tests on them. This reverts commit fe4ce563f22b6f95b6df3e5404c4167685c1626a. Change-Id: I0eac14d9c9c4e717883965e37fa6e3bbaf37f35a