fix true culprit of ClassFormatErrors; revert adding overrides everywhere