Comment 2 for bug 1794176

Fix works and looks sane to me. Thanks, Bill! Pushed to master, rel_3_1, and rel_3_0.

P.S. rel_3_0 didn't backport cleanly, so while it seemed a straightforward resolution, more eyeballs on that branch would be appreciated. We wouldn't want to brown-bag the final 3.0 release! :)