Commit e54fd25781

This is a partial merge of #6750. I took the Posix code paths and dropped the Windows code paths, and then did the improvements noted in the comments. The Windows implementation is still TODO.