Backed out changeset 0314d200873a (bug 858231) for Windows build bustage.
CLOSED TREE