Bug 5540 - Remove ConvertorManager singleton