Revert "card emulation patch port to JB"

This reverts commit 995fa7adb0374c02875a7910ef5937781791708b.