Revert "Temporary changes for public release"
This reverts commit b3f2b7b019243d6f63dd85df3103e232567b1e8d.