This broke in T350777, reminding me of this issue, but it appears I never made a task, so here one is.
Blocked by T209878 (or an alternative).