Don't buy HP, Sony, Dell, Gateway-anything recognizable, because their operating systems are contaminated with OEM garbage.
This problem is NEVER going to go away because it's an easy way to boost the margin-selling space on the hard drive.