Comment 23 for bug 39484

Note that this bug hasn't slipped under the radar or anything; I'm just investigating other similar bugs caused by this same patch, so I can fix them all at once, rather than one at a time.