Back out the window closing fix, it seems to be causing crashes.