UNDO: harmonize nestedvm and latest classgen changes