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