Drop timeout - not working
Make the env var nicer