Part of the previous commit.