This reverts commit 839ae290c1. This change is no longer necessary on top of the new upstream, I cannot reproduce the crash that this fixed with the new upstream.
839ae290c1