Merge "Fix backwards compatibility for introspected windows."