LP#1791791: remove a regression regression on bug 1923225