Revert "client commit2"

This reverts commit a1c986e64f072f7ff827f62a5edb7f58e9df8cb2.