- backport fix for upstream bug 49058