This fixes #7959.  Everything is now moved so that Roles use the new system.