Given the discussion that followed this patch I'd like to mark it as
'obsolete'.

Any objections?