Revert "Fix add imports of nested classes"