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