issue #23982: get credit cards back working in mobile

This is a better way to stage credit card data