Comment 1 for bug 1854718

We may want to fix this along with https://bugs.launchpad.net/bugs/1800676. Sahid already took a stab at it a while back but that got delayed by me.

Liam, do you need this prior to ussuri?