Here is the second try at the patch.

-Steve