Revert "NVM"

This reverts commit ce6be31984c342b739b1ebe2fe9b5e87bf0e3140.