Changes in this file seem unrelated to the change at hand.