Revert r11320 - it b0rked all src tests on at least OS/X and x86/linux

[Leopold Toetsch]

I've unapplied r11320.

* revert the whole patch
* some of it might be correct, though, please review

And a final note: please no checkins w/o testing, especially not for
config and build stuff. Thanks.

leo