Follows #6537.
Follows #6537.