Backed out changeset 08009e8417e9 (bug 951314) for Windows bustage.