Backed out changeset 59f9f7a8bd8e (bug 865806) because it doesn't contain the crashfix, per philor on IRC.