Revert commits that caused a stack overflow on Mac#6067

catamorphism wants to merge 2 commits intorust-lang:incomingrust-lang/rust:incomingfrom

catamorphism:revertcatamorphism/rust:revertCopy head branch name to clipboard