Part of previous commit.