Revert "Revert "Revert "Improved detecting change of cards"""

This reverts commit 921dc95cc8b7b84ce735fd0e4f60dd1c30492a84.