Should we backpatch your solution to this? /cc @myronmarston