Revert "fixup! RIO and AIO changes"

This reverts commit 90fb308d53dcbf2b0b46398a93a9babed4417d0e.
Revert "fixup! RIO and AIO changes"

This reverts commit 75564b4b2f8efea4e49fe83f046f32317b2932fc.
Revert "RIO and AIO changes"

This reverts commit 1415f363522eb877f092e6d50e9795993c4eed52.