Revert "NVM"

This reverts commit 0c1fe7a62a8afb7dfd2f4fc2d83bf2f4c46cb309.