Done on gambatte. No more Oracles for now...

(Note by Disclude: Already verified on ZSR, added for visibility here.)