Fixes 899174 r=@gabithume, @peterbe, @brandonsavage