WIP Commit for debugging on new cdh4.6 changes