This reverts commit 5fffc126. This is actually still broken, as CERN OpenStack is still broken ref: INC2246166