Comment 11 for bug 1738488

Looks good and doesn't appear to break anything. I have pushed this to master for inclusion in the 3.1 RC. Thanks, Dan!

I'm intentionally holding off on backporting to rel_3_0 to give some time to be tested more broadly (hopefully) with the RC (and, time permitting, some unit test coverage getting done), but barring problems, I agree it should make it into the next 3.0.x.