This reverts commit 74f4d8590de85eaa92c711010bbc0ff0e33ee2e8. Refers to the wrong issue (HBASE rather than HADOOP)