This reverts commit 16f306b4a17e0f3ab8e3381bde9b2c4c7f742ef9. TestAdminShell and TestThriftHBaseServiceHandler are failing consistently