partially revert last commits