Fix Windows bustage. Port bug 999260 to comm-central im/. r=florian over IRC