Revert Clustering Chanages That Introduce EJB-> ISPAN deps