This reverts commit 9d702007. Now that Tails 2.6 has been released (which required this workaround) let's stop doing it in the devel branch.