Undoing the vi-mode stuff, not quite what I wanted/hoped for