Follows #6055.
Follows #6055.