backport fix on 1.9