Backed out changeset b591ad43d53e (bug 1085509)
Backed out changeset 50650e0f0edf (bug 1085509) for causing perma failure in win7 xperf