Backed out changeset 21d6238c711f (bug 1079222) because it breaks the same thing, just after restarting, which is no better...