Comment 20 for bug 1670476

The patch for upstream got improved significantly.
This FTBFS is fixed in rawhide.