Second try of previous commit.