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