added some bits that were clobbered earlier
rolling back inadvertent commit of my local setting