This reverts commits 48ff7a9f3e and b2e2cf2ded because it is causing crashes in SPARC solaris and i386 debian.
48ff7a9f3e
b2e2cf2ded