Regression in b18650a2634890aa758abae2f33875daa13a9ba3. Backport of 52936efacec4df05df2d9872c09c3332335bf21b from master