Comment 3 for bug 1853820

This initially missed screening. Given the severity, it's stx.3.0 gating.
I verified that the above fix was sourced in master before the r/stx.3.0 branch creation, so the content should already be in the 3.0 builds