Backed out changeset 04d5a617450f (bug 1092979) for needed checkin of another bug first