Backed out changeset 028c43cd12a5 (bug 1051592) for Windows bustage.
CLOSED TREE