Revert credit card stripping from #1881

For reasons why, please see the thread on #2495.