For the record, here is the patch that Matt sent me privately when
he realized he forgot to attach it.

-- 
Joel