Follows #417.
Follows #417.