partially revert last change