more cleanly (I think this supports more Linux systems; not sure).
Barry Warsaw & Martin von Loewis actually agree on this!
This closes SF patch #502023.