Follows #5800.
Follows #5800.