Revert "Temporary changes for staff release"
This reverts commit 2b586dc4ef059f35beb9022f42ffd8076e67a3fb.