Revert some of the CANNOT_DUMP fix.