Revert "Temporary changes for staff release"
This reverts commit 95859fcd982286539d2d267f57b63ed07d2d2965.