Revert patch 6209, because it made the test fail.

No clue what that patch was supposed to due,
but it even slipped into dune 2.1.

[[Imported from SVN: r6716]]