This seems to be unrelated to the rest of the commit.