Revert "Merge branch 'f-droid'"

This reverts commit 25f34801a94181f3c3c8311c3db7c8299860c9e3, reversing
changes made to 5bd5b75033c379f126fd2ae8d7bc3797ba6a4e81.