Follow up to 813015d67e. Regression in 8d67e16493. Backport of 198a19b692 from main
813015d67e
8d67e16493
198a19b692