Revert "Revert LVM for now"

This reverts commit 65e89c7059f700412d2a539f0aa0939f6af89204.