- QA: Move back registerClass() code to old place