Revert "Chenged DEFAULT_CLIENT to RESTORM_DEFAULT_CLIENT"

This reverts commit f3ad341315059e127439f09c642c97cb67f4a87e.