Remove the workaround again.

You are right, that my patch did not work, if you replay the blockchain.
... But... your new version does not work for me, too.

So, here is an approach, which works for me.
I can copy wallets via NFC and the resync shows all transactions.

Thanks! :-)