Revert "Temporary changes for staff release"
This reverts commit 5f29a91fdc5fcd8eafb58569a9e5b02cf4b1bd65.