Revert "Optimization: bounds check within a bounds check; it will already have passed."

This reverts commit 73b15fe9600a62b6a5048f2fa0f23e40d208bc3e.