manual cherry-pick from master:  using SYMBOL_BASE_SIZE.