Revert "Temporary changes for staff release"
This reverts commit 81108a361ec2d41563f763b5c602af1e86240a5a.