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