Backout Bug 858640 for breaking windows builds r=bustage