This replaces the workaround calculation which was needed before the referenced bug was fixed. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=200217241
