Revert "Temporary changes for staff release"
This reverts commit 8428f7fc38ae314e889276b5dbba7a84ec7be43d.