Bug 22511: Fix type role->roll