Note: this is kinda a temporary fix, but I don't want to wait for a 'real' fix from upstream as I want to build os-autoinst for Rawhide and this bug prevents its test suite working right.
