Revert "Fix build with UOA"

This reverts commit b8956d60c2ea6a8836dc9e84e0c067cb19858a83.