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