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