Revert "offbyone"

This reverts commit 4500e9da7714471c355392ec45bb547d8c4d751a.