This reverts commit 978eb516.

The commit was broken, relying on other changes that have not been
committed yet.
Signed-off-by: NJens Axboe <jaxboe@fusionio.com>