This patch essentially reverses all the changes from the following commit: https://reviews.llvm.org/rL264513 for branch 3.9.

Requested by Richard and Approved by Hans here: https://reviews.llvm.org/D23485




git-svn-id: https://llvm.org/svn/llvm-project/cfe/branches/release_39@278771 91177308-0d34-0410-b5e6-96231b3b80d8