Revert "Fixed crash on current build"

This reverts commit b720f5e131036df5c35861db8023f5b855b30165.