Follows #5689.
Follows #5689.