Revert SlidingWindow changes