Revert ncm accounts to a state where all tests pass.

We'll keep the work for the new features in a separate branch, since they didn't make it in time for the release.