revert 82932815423db27df4574665b7caf1e61c912292, fix segfault again