Revert "More updates"

This reverts commit a972b30cfce6a593b7533a0dfc252b6dee039b28.
Local Changes
Merged