Revert Clustering Changes That Introduce EJB-> ISPAN deps