This reverts commit c8d2e937.

We run into merging problems with the SCSI tree, revert this one
so it can be handled by a postmerge tree there.
Signed-off-by: NJens Axboe <jaxboe@fusionio.com>