Ubuntu

Comment 7 for bug 570787

Sorry all... I think I wanted #529696, though the bugs look like they have the same root cause.