Vista - Don't Append Primary DNS Suffix

How can I configure Windows Vista to append the connection-specific DNS
suffix to DNS lookups but not the primary DNS suffix?

Here is the problem I am having. Laptops are joined to the AD domain so
their primary DNS suffix is the domain name. (I will use company.com as an
example.) Unfortunately, someone else registered our internal domain name on
the Internet and has a wildcard/catch-all DNS entry set so every hostname
resolves to the same IP address (e.g., 72.3.135.151). Internally, DNS
resolution works well because the internal DNS servers are authoritative for
the domain name. However, when not on the company network (such as when at a
client's site), all DNS lookups not using a FQDN return the same external IP
address (e.g., 72.3.135.151). Also, even if using the FQDN in nslookup,
everything always resolves to the same external IP address because nslookup
always appends the primary DNS suffix (e.g. hostname.test.com becomes
hostname.test.com.company.com, which returns 72.3.135.151).

I realize that there are workarounds (e.g. make the primary DNS suffix
different than the domain name, always use FQDNs, append a period at the end
of the FQDN in nslookup), but all of them have their problems and drawbacks.
For example, even if users get used to using FQDNs, some of our clients have
web-based applications that use just the hostnames. When using one of these
applications is accessed with one of our laptops, links to server2 get
redirected to server2.company.com, which brings up an external webpage and
breaks the app.

So, if it's possible, the only good solution I can see is to configure
Windows to ignore the primary DNS suffix and only append the
connection-specific suffix.