Comment 3 for bug 1717025

This is a bit bigger than I feel comfortable squeezing into beta2, but conversely, it's small enough that as upcoming 3.0.x release maintainer I'm willing to have it go into 3.0.1 as a minor enhancement.