Revert "Another attempt at fixing the same crash"

This reverts commit 033645a348745e37a506e8eed95ec39e4be91e20.
This should actually fix it :D