Revert "Temporary changes for staff release"
This reverts commit 4623f95d304ff315687b88e2d59e68e7a8db6cc2.