This reverts commit f675a60c. The commit had the wrong title/description. Sorry about the mess! llvm-svn: 362892