Already did on my local copy (that's my bug). But I'm having trouble compiling it to test, which I like to do as a habit before checking in, and didn't do it this morning while hanging with my son.

If someone wants to overlay the patch on their own code, do one last quick test, and checkin, I'm totally cool with that. It's too methods only.