Revert "Backport another (earlier) fix related to ticket 1944003."
This reverts commit 2012215603ee181e038845c2b5512f359cb8a823.
Authored by: felixo 2008-06-16
Parent: [r199]
Child: [r201]