Prep for 1.628_50 trial release.
Replaced ErrChangeCount with alternative approach that's binary compatible.

This reverts most of 70fe6bd7.