Backed out changeset b0a4653325cc (bug 941565) for Windows bustage.
CLOSED TREE