refactoring to fix the nasty class not exception during bootstrap
This tag has no release notes.