bcde95efec
This reverts commit 494dd8da82.
Reason for revert: Breaks ub tests
Change-Id: I8f0d4a67e7a4cae21f5c9448abcc4d614f730fa4