This reverts commit 157bf4c5cc18941a9a382be8310119d1b66105cb. The
feature hasn't merged into upstream OVS yet. We should wait until it
does so in the event that there are changes (or it fails to merge at
all).
Change-Id: I564cae602bd88d71ce0796202db764502b2108f1