Return water services to public control