I've reverted the changes needed for Ubuntu. The changes for Ubuntu should go...

I've reverted the changes needed for Ubuntu.  The changes for Ubuntu should go under a #if and I'm not sure what that #if should look like.

llvm-svn: 105337