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