Revert "Fix some valgrind issues (#856)"

This reverts commit 94c550d834ece603272a335b97ec3759d58effeb.
2 files changed