Back out 495a9c210b91 (bug 933798) for causing crashes like bug 935348.