Revert "fixing client side"

This reverts commit b1a25cd72f3857e5bcafc590feab34abab54fb25.