This reverts commit 254c4407. It causes crashes with cryptsetup, even after a few iterations and updates. Drop it for now.