It is a shame that the fake market makes shopping for "real" 18650 cells practically impossible. The 18650's are so convenient for small flash light and little electronic gadgets that one can cook up.
With the more modern (slim) laptops, they already moved away from using 18650's. So even the re-packed/re-skined battery market will have a sourcing problem. I suppose consumer 18650 market is or will be a thing of the past.