This reverts r359311 and r359312 (git commit 0bf06a8f59 and 5f184f1780) llvm-svn: 359830
0bf06a8f59
5f184f1780