Not sure that this is the best fix, but it does work.
Fixes: #20834 (closed)
Cc: @cory.quammen @utkarsh.ayachit @acbauer @dgobbi