revert s3_clnt.c to the official code