Tokyo: Geisha festival revives