Revert "Temporary changes for staff release"
This reverts commit 217f35611d86b2f99459657904cd8994433b7684.