Follows up on #485.
Follows up on #485.