Revert "keystone role cleanup"

This reverts commit 62f050796ef3f7820047b79d7e2e76bba32fd953.