This reverts commit d16355b8, reversing
changes made to eee9369b.

This merge (perhaps in combination with something else boot related,
e.g. the new initramfs-tools) seems to make Tails unbootable on a
variety of systems. Let's revert this until we understand this issue
and can fix it.