Roll back hacks for SII

Note button is still screwed up