Regression in 4dfd6b88d520b43b6363946e5ee58ba14cd1efe6. Backport of 3187c89d6f8c60ca7e78093d5b37e0709e71cea9 from master