Backed out changeset 5373095214d9 (debugging patch for bug 924771) because it is no longer needed