Wouldn’t it be easier to address bug 881672 first? (see #10337)