This reverts commit f8fa909444.
Reason for revert:
Because the OpenStack CI OS (Ubuntu 20.04) still doesn't support OVN > v20.03, we need to revert this patch until the CI migrates to Ubuntu 22.04
Change-Id: Iafd0ce629bf3a93454f4e322780d3b2f911363f8
Closes-Bug: #1991962