Revert wrong changes introduced in 2.4.21.

From: Stefan Talpalaru <stefantalpalaru@yahoo.com>,
      Ingo Kilian <ikilian@web.de>.