Merge uzeo oba
Revert "Merge uzeo oba"

This reverts commit 9b866b983e37665d1b896ee9d4617210e67a78f2.