Backed out changeset 0ef00ffc6c12 for bug 923193 due to test failures: