Reverted back to non-NIO commit and recommitting Leon's NIO code backup