This code path shouldn't be needed, so remove it for now. This
tidys things up.
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>