Backed out changeset e2fee324047d (bug 857628) for causing bug 1076892