some quick hacks to avoid segfaults for now
Revert "some quick hacks to avoid segfaults for now"

This reverts commit e064a50981553e21421198a51d2488a64b5fae48.