LP#1791791: prevent regression on bug 1923225