Revert "Pull AIO leak fixes from Ben LaHaise:"

This reverts commit 0102d1ccf7ae4157ef8fff607d7b45c920b6268c.