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