Revert "Temporary changes for staff release"
This reverts commit 20c8d41d0ed2dec55ea7925e288ab5365f8337d1.