This reverts commit 50d2dca22b3b05d0ee4883b0cbf93d7d15f241fc. llvm-svn: 371215 (cherry picked from commit 5d9f419a) Change-Id: Ib46ae926b210c7f5b9e14769334d58ee156d8a92