Revert "Cleanup and fix CAF SSN handling code."

This reverts commit fe7947b5c1b36b0f9f7ae83a44bf93e1502dfdef.