Revert "Merge pull request #1091 from Gozala/hotfix/io"

This reverts commit 8dc5b9e94d04a6e75300faf37b7037884fbdbaea, reversing
changes made to 08d8efd1a71c79cf78bba49d69d257e89e2ff5ea.