Merge "Revert "Assert SNI type is SNI_HOST_NAME""