There's no need for such a bloat method to replace just two vars.

Change-Id: I235d092b89160c2599a41e1046a15475b8ba433c