Revert "added all the necessary changes to compile with CDH3"

This reverts commit 02c8846ee7c37e542d5baed1a5aea3a4b7c190cc.