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

This reverts commit e6d95344d6d3c691a6a3fba093ba158cc0743083.
build for CDH3