da1d90 Fix forward port of the patch.

Authored and Committed by tmraz 4 years ago
    Fix forward port of the patch.