Revert previous commit for now, leads to crashes.

This reverts commit d510c8c12666ffcd8acc580b49082ff8d6ac159b.