620470607e
Causes TestAdminShell and TestThriftHBaseServiceHandler to fail 100% of the time in branch-2. This reverts commit 8ae3480e70e8900c0c53b60f9bac69967813f1fc.