Revert my cdh4 catastrophe.
Merge pull request #301 from ambiata/topic/revert-cdh4-mess

Revert my cdh4 catastrophe.