Besides, wonder if this belongs in this patch at all?