(PDB-605) Revert some 1.6->2.0 changes

Some files had 1.6 converted to 2.0 erroneously. This fixes up those mistakes.

Signed-off-by: Ken Barber <ken@bob.sh>