This reverts commit r309942 & commit r309940. A revert was requested following post commit review. llvm-svn: 309978