switching back to using service endpoint