This fixes problems with LUKS partitions not being detected (cherry picked from commit 30c008d551)
30c008d551