s3 build: Revert previous patch to fix the build