Revert "Merge branch 'master' of ssh://git.average.org/~/NFCAuthCR"