Backed out changeset a902370b74af (bug 903714)