This is the original commit.