added the necessary changes for cdh3
Merge commit '0081a01'
Revert "added the necessary changes for cdh3"

This reverts commit 0081a01218ad0091986ad3ac3ee243415c27b67f.