This reverts commit def3818792. Those changes are causing troubles when running Zuul functional tests. Change-Id: I13627b11c2a85b7a7dfc6c9950a36d08b162b9f5
def3818792