Revert CoreConnService.java back to master