Reverted much of previous commit.