Remove a manual renaming of a variable that was introduced before

llvm-upgrade could properly handle collapsed type planes.

llvm-svn: 32875