revert-upstream-ac234a9c55ae-fix-duplicates-and-crashes
