da1d908 Fix forward port of the patch.

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