Water supply back to normal in Girgaum