Fix-committed: #10345

Fix-committed: #10208

That ticket wasn't fixed, after all.

It turns out a mistake was made so he liveusb-creator shipped in Tails
1.7~rc1 doesn't include the fix for #9681.

Refs: #9681

This reverts commit 92b600e9.

A mistake was made so the liveusb-creator shipped in Tails 1.7~rc1
doesn't include the fix for #9681. We have to temporarily revert this,
and fix the situation in Tails 1.7.