Part of last commit.