@martincgg: I was adding it because we _thought_ that there was something specific to **XP**.

I'd *rather* **not** have a specific code path for **XP** v. **7+**.

I've pushed a refreshed patch which now provides something better.

If @sgrebnov , @martincgg , @jengee could all test, that'd be great.

I'm actually on vacation today and next week, but I'd still like to get this settled ASAP.