Calls for overhaul of Dublin water supply