1.5.4: Revert "patterns: meta: Tweak NFC related parts"

This actually breaks building with the SFOS 3.4.0 intented versions of
NFC stack, so revert this until the next SFOS upgrade is out.

This reverts commit 06471b5e90d5680be2a4a2d0305fe241f03e2219.