Revert "remove optional destructor frees"

This reverts commit e8d7a01c664c86715bb9ca1d6713b056d0b5074e.