* commit 'be3363f664d7314d55b42860bd4077154752d769': nsv: Drop disabled cruft Merged-by: Clément Bœsch <u@pkh.me>