Revert command-line CLIENT_TYPE option