LP#1732591: (follow-up) fix major regressions