[PM] Revert r279227 and r279228 until I can find someone to help me

solve completely opaque MSVC build errors. It complains about lots of
stuff with this change without givin nearly enough information to even
try to fix.

llvm-svn: 279231