This patch passes all the tests for me that were passing before.

I'm still not convinced that our patch for Bug 1437480 is ready to go yet, so I have held off that one, to minimize chances we'll need to backtrack.