Reverting commit 306414 on behalf of @gadi.haber

llvm-svn: 306532
32 files changed