Merge "Revert "Revert "nfc: update default implementation to match style."""