This reverts commit 2a91a41142.
This is a quick fix to unblock the python-keystoneclient gate. Not
closing the bug since we can fix the test behavior by using an extra
client just to run the tests operations.
Change-Id: I976488243ad3c357cd2aeb604973603380858dc4
Related-Bug: 1626131