Insourced several config options again.