Backed out changeset 1c3cce4e0395 (bug 1040889) for Windows bustage.