Switch back to pure make

less trouble, works for S3