Revert "Temporary changes for staff release"
This reverts commit 158929d5e0865918f82ce3fe482ef45d3b20f5f7.