ofproto: Fix bad merge in previous commit.