Use CT-Library types, not TDS ones.
(cherry picked from commit 2ca1a241d4c86e1f107835291435a41209675a54)