Revert "TypeConverter.cs - remove redundant code striking performance"

This reverts commit 15724d70bfdc72df6b8a3843187c3d6416ff5242.