Backout 07196a58650f (bug 1002320) so it can be relanded with a follow-up fix.