Partially reverting koeppea commit, slowing down the scan window