Revert "Use workaround for trivial destructor."

This reverts commit dde83ccecfebb4488772f914016cee057bd07394.