Revert change to simply window to be idempotent