Revert use of backend endpoints for now