This reverts commit f99d5f8c. The change was causing UBSan and other failures on some bots.
mentioned in commit f2f3a80f