 	 */
 	protected function connectSuccess():void
 	{
-	    // If we own the wait guard for initial Channel connects release it.
-	    if (_ownsWaitGuard)
-	    {
-	        _ownsWaitGuard = false;
-	        FlexClient.getInstance().waitForFlexClientId = false; // Allow other Channels to connect.
-	    }
+	    shutdownConnectTimer();
 	    
-	    shutdownConnectTimer();
-	    _connecting = false;
-	    
-        // if there were any attached agents that needed configuration they
-        // should be reset
+        // If there were any attached agents that needed configuration they
+        // should be reset.
         if (ServerConfig.fetchedConfig(endpoint))
         {
     		for (var i:int = 0; i < channelSets.length; i++)

    
    /**
     *  @private
     *  This method is invoked by a timer from failover() and it works around a 
     *  reconnect issue with NetConnection based channels by invoking 
     *  internalConnect() after a slight delay.

        }
        else // Not attempting failover.
        {
    	    connectCleanup();
        }
        
        if (reconnecting)
