Backed out changeset b0087e17cd5e (issue #26765)

For unknown reasons it perhaps caused a crash on 32-bit Windows (issue #).
3 files changed