revert hadoop 2 move on master, should have been on wip-2.5