A counterpart to #6485
A counterpart to #6485