Fixes bug 19969; bugfix on b1d56fc5. We can fix this some more in
later Tors, but for now, this is probably the right fix for us.