Regression introduced by 9934931f1f See #3772 (cherry picked from commit 82e0066ed4)
9934931f1f
82e0066ed4