Backed out changeset a686c6909b22 (bug 928833)