Followup to #742.
Followup to #742.