My Logitech G604 takes only one AA. I'm not sure the advantages over NiMH (lighter weight, higher capacity) are worth soldering in diodes especially when the efficiency loss would negate the capacity advantage.