anchor.diff:              showAll = true;
               break;
           }
  -        if ( trustStoreConfiguration == null )
  -        {
  -            trustStoreConfiguration = certificateStoreManager.getTrustStoreConfiguration( connectionType );
  -        }
  -        if ( !trustStoreConfiguration.equals( certificateStoreManager.getTrustStoreConfiguration( connectionType ) ) )
  -        {
  -            showAll = true;
  -            break;
  -        }
  +
  +        // Disabled this until we sort out the difference between regular trust stores and the client trust store.
  +//        if ( trustStoreConfiguration == null )
  +//        {
  +//            trustStoreConfiguration = certificateStoreManager.getTrustStoreConfiguration( connectionType );
  +//        }
  +//        if ( !trustStoreConfiguration.equals( certificateStoreManager.getTrustStoreConfiguration( connectionType ) ) )
  +//        {
  +//            showAll = true;
  +//            break;
  +//        }
       }
   
  -    pageContext.setAttribute( "connectionTypes", showAll ? ConnectionType.values() : "COMBINED" );
  +    pageContext.setAttribute( "showAll", showAll );
  +    pageContext.setAttribute( "connectionTypes", (showAll ? ConnectionType.values() : new ConnectionType[] { ConnectionType.SOCKET_C2S } ));
       pageContext.setAttribute( "certificateStoreManager", certificateStoreManager );
   
       boolean update = request.getParameter("update") != null;
  
positive.code: 
      <c:set var="title">
          <c:choose>
              <c:when test="${connectionType eq 'COMBINED'}"><fmt:message key="ssl.certificates.store-management.combined-stores.title"/></c:when>
              <c:when test="${connectionType eq 'SOCKET_C2S'}"><fmt:message key="ssl.certificates.store-management.socket-c2s-stores.title"/></c:when>
              <c:when test="${connectionType eq 'SOCKET_S2S'}"><fmt:message key="ssl.certificates.store-management.socket-s2s-stores.title"/></c:when>
              <c:when test="${connectionType eq 'BOSH_C2S'}"><fmt:message key="ssl.certificates.store-management.bosh-c2s-stores.title"/></c:when>
  
negative.code:         </c:choose>
      </c:set>
  
      <form action="security-certificate-store-management.jsp" method="post">
          <input type="hidden" name="csrf" value="${csrf}">
          <input type="hidden" name="connectionType" value="${connectionType}"/>
  