Fix Windows bustage. Port bug 999260 to comm-central. r=jcranmer over IRC