I have no idea if this is still needed, but removing the workaround seems like the easiest way to test. I'll revert this change if the bots go red. llvm-svn: 373650
And other various cleanups to the configuration. llvm-svn: 363722