Mahathir brings water dispute with Singapore back into the spotlight, says the ongoing deal is 'too costly'