[PAXURL-246] Remove S3 workaround