Yet more of previous commit.