removed the dependency on r17 epp.