Revert "Temporary changes for staff release"
This reverts commit 2f13a6c3949040d699783802fa068028bdd108b9.