Fix http://llvm.org/PR5116 by rolling back r60822. This passes `make unittests