Revert "Temporary changes for staff release"
This reverts commit 37c10c58767b3237a1c4ce77ee5495539d5bd734.