Fix ciphersuite handling during an HRR