Patches are supposed to fix things, not leave them broken in new and interesting ways, so I thought I should redo yesterday’s patch in such a way that it would actually have value. If you are scratching your head after applying yesterday’s patch, please reapply it.