PLAT-5917 - ToolContextUtils does not respect requested type

Reviewed-by: Chris