Backed out changeset cfef36c0c8bc (bug 858674) for Windows bustage. a=backout