tmp
Revert "tmp"

This reverts commit 7aab3512a395a8fd73a9f6873bc3fb53452019ed.
Revert "Improved interpretation of window-length"

This reverts commit 1b311afef7cd3b7e38d77a75a5478347bf9cd746.