Revert "Temporary changes for staff release"
This reverts commit 84a26fd55791630868977c5f356e6737520e7dd6.