Revert "Lots of updates."

This reverts commit b3c2f99848d18c09a360b91aa2716c0cd9f08711.