Backed out changeset 143ae44587b2 (bug 559505) for xperf failures