Follows #6515.
Follows #6515.