Tweak the workaround yet again (with soft fail this time)
    
    Sigh, sorry, just perfecting. This way it won't fail when the
    bug is fixed (hopefully).
    
    Signed-off-by: Adam Williamson <awilliam@redhat.com>