Revert "Temp fix for api/keystone.py"

This reverts commit d0403e9318660e6cfa42c02c6be3b2b800548593.
https://review.openstack.org/#/c/9582 was merged in July.

Change-Id: I24929f9b48cde53cc9d0c27a57dc078e0e9a5579
Merge "Revert "Temp fix for api/keystone.py"" into stable/folsom