Follows #391.
Follows #391.