Thanks for this patch; it's nice to remove code.  This one required 
several alterations while merging, due to other changes made recently in 
this area; I'm attaching the patch I pushed.