Note attempted Windows fix in af9519563.