revert r30566 and r30567 to fix FS#12294 (superfloppy not mounting)