Revert "updates 7-18"

This reverts commit 0c50978981128fe5ca004c766f001ba2a2b3ccc5.