Revert "Changes as of Aug 14"

This reverts commit 0a028cea423cb5fa048fa4229464ad54702e218f.