Revert "Temporary changes for staff release"
This reverts commit 3df63063fa758d766a9d35f2ffe391a727eb4a9c.