acuacu71664 - revert changes, decided to fork thrift_client