Added back shell and ido, but made them opt-in.