Revert "Temporary changes for staff release"
This reverts commit 4a7c2f046b0c9b9ae36bd65e579315a64959a6e1.