Follows #5216.
Follows #5216.