[AC (pkgs)] Revert comint/shell changes