Revert "[name] Simplify buffer-length calculation" This reverts commit d70595657e8d56b52d5714d082092d8eb104093e.