Revert "Fix for crashes"

This reverts commit 47113d7b1bdef797ab7bd9168a8e340191efb8b4.