Revert "Improved interpretation of window-length"

This reverts commit bb17387e18fd7a18beb6d3521fa02cf5aaf12cc6.
Improved interpretation of window-length