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

This reverts commit d89c5afb24cf7d1e53da335d2a51fb25ca876e04.
changed the cdh3 commit sha