revert rev. 1.22 again, just in case this is the cause of the segfaults reported on OpenBSD and SuSE.