Revert rev 74134, as it does not completely fixx issue #6493.
3 files changed