block-mount: Reverting 26503. Was already fixed in a better way in commit 26474.