Removed no-incremental from snapshot.

It was not being followed uniformly, it was causing test code
to follow non-production paths, and was just more useless code.