Please ignore the last email; it has a broken patch.  Corrected patch attached.