City of Flint to Return to Detroit Water