Deja Vu as city returns McGrady as Mayor