rework 330-remove_m64_switch patch to be less intrusive, thanks nbd