This reverts commit 0feb4d074c.
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BackupCodeFragment.java
This reverts commit 0feb4d074c.
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BackupCodeFragment.java