Regression from "abi16: implement limited interoperability with
usif/nvif".
Signed-off-by: NBen Skeggs <bskeggs@redhat.com>