Revert "NOS #2"

This reverts commit 24145855c55e0ff6568cfe7fe5aca8e9066bea7d.
Revert "NOS"

This reverts commit 409446a940d483330eeb0a9b86f605f2b23d4e7c.