Follows #368.
Follows #368.