Simplified last commit.