Follows #338.
Follows #338.