Judge puts former Gov. Snyder back in Flint water litigation