This reverts commit b41dbbe9cf. Revert this ... it works, but it's not the "proper" fix as it just causes the crash(s) to happen elsewhere ... time to dig deeper
b41dbbe9cf