Revert "I can't tell for sure if gainspan is doing the right thing after first config, so being paranoid and making sure ncm is set right after any change"

This reverts commit d04efcc49131b0528dadddd347c8c2480605be8c.