Follows #5241.
Follows #5241.