@handreas @smichnow can you please review this? This role is no longer required for M3 so I'd like to remove it and avoid the confusion of accidentally enabling it in the future.