With each GB, the product information becomes more cryptic! Given the current issues with shipping batteries outside of lights, and limited distribution of 21700 batteries in some countries, I would hope that a 21700 will be shipped with this product?