Remove check for window, as it appears not to matter.