Update for Josh's changes.

Signed-off-by: Peter Jones <pjones@redhat.com>