Fixed a bug introduced by svn 671. Also reverted the Indexed I/O turn-off because the kernel isn't ready for it yet.