[v6r12] Always removing the UseServerCertificate flag before leaving

... with some urgency