Partial fix to #1938 (New name and location for Re-Roll)