Apply missing part of 202a5afc27ed2aad3c9367ed022d119f23592e38

The change to ofp_v4_map didn't apply cleanly.