Revert "Temporary changes for staff release"
This reverts commit ba899f0f379e4ac121d846e1e32bfc13477e421d.