Revert r10892, it's wrong and no longer needed to prevent crashes