backport the fix from !5188 (merged) to 19.3.x
afaiu we aren't making further 19.3.x updates, but the backport might be useful to distro's.
backport the fix from !5188 (merged) to 19.3.x
afaiu we aren't making further 19.3.x updates, but the backport might be useful to distro's.