This reverts commit 709eb417. The liveusb-creator shipped in Tails 1.7 has the fix for #9681 (which was intended for 1.7~rc1) so the revert can be reverted. :)