Turns out this doesn't work for 4.9 either: It breaks on MinGW. I'll revert this on the 4.9 branch as well.