Revert "Temporary changes for staff release"
This reverts commit 82fe45056ade4a452dea5bec6f81a86a7bed5364.