Follows up #6575
Follows up #6575