More bug #1077106 stuff, sorry -- modem induced impatiece!

This should go on whatever bugfix branches the other fetches up on.