Revert "Temporary changes for public release"
This reverts commit 284fbc42dde545b3476d4a5dc28c9ffb79cfbd31.