Restore Win7 + Server Core support routines.

This restores the changes that were blown away during the rewrite that was merged last week.
/cc @jhawk42