Revert leak-fix part from commit eb8ba5489

I thought it leaks there, but the 'mailbox' variable is freed elsewhere,
thus the added code caused a double-free.