Revert "Temporary changes for staff release"
This reverts commit 9c8d8ac78787dd231f039cc37156c7da5f8632ef.