Revert "Removing a role should do it on the base class not the instance class"

This reverts commit 83d4fa72ba4c64387b3f43016f75904b390d54e6.
Properly resolve the class name when removing a role from a subclass