Non-clustered EJB client connectivity does not reconnect when host comes back up in JBoss EAP 6

Issue

• EJB client connectivity fall back is not working.
• We have migrated from JBoss 4.3 to EAP 6.0 and are facing issues with EJB remote client applications not being able to reconnect with particular host that is restarted.
• We have 2 NON-Clustered server instances (JBHOST1 and JBHOST2) serving the application. Our client application is connecting and fetching data from jbhost1 as primary and in the case this server is down it gets served from jbhost2 (as defined in attached jboss-ejb-client.properties file). while this failover scenario is working correctly, when the first server is bought back online, requests are still being served of jbhost2 and its not establishing connection back with jbhost1.
• JBoss EAP 6.x ejbclient DeploymentNodeSelector not working as expected, We are trying to use the org.jboss.ejb.client.DeploymentNodeSelector to assist us in a round robin selection, If one of the clients goes down, it is removed from the nodes list, but when it comes back up, it is not re added to the list.