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