Revert to NIO