Instead of adding a new mechanic, let's mess with the numbers this time.
In this variation, the numbers indicate how many total safe cells are around the 8 surrounding cells.
In other words, a 1 cell would be a 7 cell because of the 1 mine and the
7 safe cells.
Visually, here's how a 1 cell would look with this change:

No double mines this time, but they'll reappear soon!