I don't mind doing a rapid follow up diff to yours to make this happen in windows before the tag.