Auto merge of #3108 - gw3583:crash-fix, r=jrmuizel

Temporarily revert #3079 for a crash workaround.

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/webrender/3108)
<!-- Reviewable:end -->