The Ryobi "ONE+" range is where you buy a bare tool and the battery/charger separately. At $35 a pair it's not going to be worth rebuilding, so long as the contact end is compatible with the older tools.
PS: They're $54 each here, you lucky persons!
Alan
