Also revert r210096 which temporarily disabled the test while this was being investigated. llvm-svn: 210115
llvm-svn: 210096
llvm-svn: 210059