Revert removal of error supressor during upghrade
Fix invalid class name references.
Revert old APIs for the time being