Fix Issue 9081 - Modules shouldn't have a type
Merge pull request #2866 from yebblies/issue9081

Issue 9081 - Modules shouldn't have a type