Back out two accidental changes that snuck in with r229245. Sorry these

snuck in, they weren't ready for prime time and had *nothing* to do
with that commit.

llvm-svn: 229248