tree 92e7ff15bc94e56b1af2069555186e216104ca30
parent 40dfb2980a54c06b4d1374ed84ea3ab5531818a0
author Mark Thomas <markt@apache.org> 1624653536 +0100
committer Mark Thomas <markt@apache.org> 1624656739 +0100

More refactoring of the BZ 65397 fix.

Revert some of the changes made for MacOs and implement a solution that
hopefully works on Windows, Linux and MacOS.