Revert "refactor to windowing"

This reverts commit 4c8078f636c14f57e11df0e249d2ecd43993e6c3.