Regression in 967450a3bf940c43db891fe1e2ef3bcf73456ff8. Backport of e3c852cbd609484b272f563f3c21066fb12ef7f8 from master