Revert "Update card class"

This reverts commit 1905327d89042a8c455b5106696fe790c7e24f74.
Revert "Update card class"

This reverts commit 6f4e273584e40e1127000f28b64c3b88b224bf37.
Revert "Revert "Update card class""

This reverts commit db39b6881c00b436d9ee9df0fd18e1255bfd0eba.