Fix import from server

Was broken since 7bbe869c88c445b087e32a75572cf18efa2165b6
This also keeps the ACTION_IMPORT_KEYRING action stable
Undo import changes
Merge pull request #726 from mar-v-in/fix-import-from-server

Fix import from server