Rolled back to relying on tabs