Revert "Container fix: off by one"

This reverts commit 4adf3658fccee04f1494427e3335fd9e7141c61a.
Revert "Skyboy's single-use container fix (more or less)"

This reverts commit 42aaeadf2f406dc64933d29d28c32fb61fc56fd2.