Followup from #1694
Followup from #1694