Regression in 3aa9ab39cce6b2a27d6334ad0148c8f37b6f5986. Backport of c03e41712b2274f524d32bc2aef455ed82c9e3b4 from master