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