Revert to static classes in attempt to fix in IIS
Version 2.4.1