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

This reverts commit f5d5f423840698fdeac2b9d9c5ac56a53b04f4d5.
set the proper commit sha for CDH3