These will be replaced in the near future, the code isn't yet stable enough
for this merge window however.
Signed-off-by: NBen Skeggs <bskeggs@redhat.com>