Sorry, patch 0002 is wrong.  Attached is the correct one.