The code removed in 25f19367 tried to do this but failed As it turns out the idea was important, so do it properly