Backed out changeset 24fda7c805e3 (bug 962736) for potential xperf bustage on an already CLOSED TREE
Backed out changeset ad1af0ef7f50 (bug 960051) for potentially breaking xperf on an already CLOSED TREE