REV-23 *Fix ssl to plain-text scenario