Fixes #9836 - use provider type in host helpers
(cherry picked from commit c2f60b5702320f4be3125d9fed8a30a2ec7a3994)
Fixes #9836 - use provider type in host helpers
(cherry picked from commit c2f60b5702320f4be3125d9fed8a30a2ec7a3994)