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