Attempt to get the diff on github right by cherry-picking previous commit.