wrap new behavior in env var

This is not permanent.  It's so I can turn this on only for some workers
and quickly turn it off, if needed