Partial reverse of previous commit.