This should fix connection issues, at last.

At the very least, it'll take us to a pre-5524848c state, which broke
things a lot.