Revert "fix off by one bug when calculating the entry_skip for the next block"

This reverts commit 2b359f3aa99fb8efb426031d6df7519abbd4c640.