Revert "Misc updates."

This reverts commit eac44c7ae959dc99723d78d633d6291f9f8b7b8c.