This is causing assertion failures; reverting until I can fix.

This reverts commit r255267

llvm-svn: 255324