Revert "Temporary changes for staff release"
This reverts commit 60dd6be2c90ad4d28695eebd65528607041d470a.