revert to sane config; new TODO