Backed out changeset 0acc877be680 (bug 1013448)
Backed out changeset 1eb359cf7ac0 (bug 1013448) for xperf test failures