Fix an issue where CommonUtils was getting instantiated multiple times.