Simplifying the window fix based on feedback so that we don't need the new internal method.