Remove Linux Plat from ResolveHosts
Land #2415 again to ensure the correct commits are merged