Revert previous commit that seems to introduce a segfault.