Revert "nfc: update default implementation to match style."
am: 3768be324b

Change-Id: I51ae622cd0ebc906b0b9ff11f5567869181d3879