Revert client specific changes

This reverts commit 9be612d3bf6b29495981881101c3851f186cf61e.
Merge branch 'client-cleanup'

* client-cleanup:
  Revert client specific changes