Revert "Temporary changes for staff release"
This reverts commit 856b984af9ad21a6536f09897a23ff1b7ca7264f.