By applying the old patch (compatible with 1.18.x and older). Also refactor expression to make presence of the "old" version more explicit.
Dmitry Kalinkin