This reverts commit 9395b34e, because it did not have any effect in eliminate ubsan warnings as intended. Change-Id: I9221385217f062a0356fe0c68643b12751048f69