Tweak previous commit to avoid some bugs
    
    The previous commit would lead to the 'workaround' getting hit
    incorrectly, and might have had some other issues...tweak it a
    bit.
    
    Signed-off-by: Adam Williamson <awilliam@redhat.com>