Re: #6401: Unblock Koji for (unretired) surf