Oops I messed up the commit message in the patch.
Revised patch is attached.