block: revert the previous backport of mainline Linux