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