Follows #6538.
Follows #6538.