Followup to #655