block-mount: Revert 26468: it causes a kernel panic due to pi_include failing due...