Here is an updated version of this patch.  WDYT?