s3: Fix the non-merged build.