Fix didn't work for all cases, reverting to add a (hopefully)
better fix.

This reverts commit f151ba98.
Signed-off-by: Jens Axboe <axboe@kernel.dk>