There should be no code changes here, just shuffling stuff around.
Signed-off-by: NBen Skeggs <bskeggs@redhat.com>