This commit removes a workaround to calculate the `expandoStartIndex` value. That workaround was needed because the `expandoStartIndex` was updated previously, so it pointed at the wrong location. The problem was fixed in PR #39301 and the workaround is no longer needed. PR Close #39416