Yeah, that is the issue. A keyboard replacement means replacing both battery and keyboard because they are glued together.

But I have heard that they were replacing older keyboards (2016) with 2017 models (You could easily tell because they add new symbols above control/option.) I wonder if they'll be doing replacements with 2018 keys now. It would be really nice - the keyboard reliability is pretty much my only complaint, minus not having a physical escape key.