Revert cbdc3fc4b9: I messed something up, we're dropping core instead of
leaking memory.