Comment 4 for bug 2050227

Galen, any non-whitespace changes in 84fa09ce0c0 were mistakes that I did not notice. I'll take this back and fix it.

I messed with this quite a bit over a few days and rebased it on main a couple of times. One of those rebases likely had some unintended side effects.