Upgrade tabs to fix hanging in #1663