Revert "Set default IO scheduler to ROW and merge block&ROW improvements"

This reverts commit bba8d40bf98ada8880a925df89bd858b65d01603.