I feel like we only needed one if($tabs) here

tabs_might_disappear_better_be_sure_they_are_still_there.php

  <?php if ($tabs): print '<div id="tabs-wrapper" class="clear-block">';
  endif; ?>

    <?php if ($tabs): ?>
    <div id="drupal-control-bar">
    <?php endif; ?>
    <?php if ($tabs): print '<ul>' . $tabs . '</ul>';
    endif; ?>
  <?php if ($tabs2): print '<ul class="tabs secondary">' . $tabs2 . '</ul>';
  endif; ?>
  <?php if ($tabs): ?>
    </div><!--/ #drupal-control-bar -->
  <?php endif; ?>

  <?php if ($tabs): print '</div><!--/ #tabs-wrapper -->';
  endif; ?>