build: we don't need the special case for s3build any more