Rollback Request Client

This issue fixed issue #586 and revert the current state of the branch to f8a7d30