Revert "Temporary changes for staff release"
This reverts commit 12365b149c604574ab583f58b45ed725691a4528.