Backed out changeset 0cdef46c65c1 (bug 979104) for causing bug 1024324