Remove workaround for keystone

This was required for an ancient keystone version, we can consider
this as solved in H release.

Fixes bug 1174194

Change-Id: Iecee7f3af01cc18ce44d3cf1ecc1b72be8fa765b
Merge "Remove workaround for keystone"