full revert with good changes