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