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