Revert "ML2 Type Driver refactor part 3"

This reverts commit b29b9c8aa701b62d28fb9a1f02459d61e355c971.

Change-Id: If6dba461ca13c29f36c61079842687b5a30f6b37