Test failure fixed. This reverts commit e204d244. Change-Id: Ib8f7cabe9a7c8d233b4aecb3806951886d585d26 llvm-svn: 371003