Revert "Temporary changes for staff release"
This reverts commit 0ba4a077534df1e00aeee3857db7165fa2389620.