Revert previous change and use an alternate approach, this time actually tested on one of the platforms that exhibited the problem this tries to fix.  Solution contributed by Michael C. Maggio; thanks!
Revert previous change and use an alternate approach, this time actually
tested on one of the platforms that exhibited the problem this tries to
fix.  Solution contributed by Michael C. Maggio; thanks!

cgwalters/expat-git-mirror,cgwalters/expat-git-mirror,cgwalters/expat-git-mirror