Comment 9 for bug 1965758

Then this should be trivial to backport, if you need it backported waveform and you don't want to handle the actual backport uploads, I'll take this on, I have some spare cycles today this afternoon.