Revert "Merge branch 'master' into next"

!2083 (merged) deleted the NONET defintion, so having this here doesn't do anything

This reverts commit b26cf524, reversing changes made to a68440c4.