Follows #310.
Follows #310.