Fixes 889639 - r=peterbe