Oops, I included the wrong diff. Perhaps I should check them better next time. Here's one that should work.