Revert "Temporary changes for staff release"
This reverts commit eb600401d432db6bbb476a7885fd2763cbf465bc.