This reverts commit 20b945df70. Broken on Hagen's Macintosh. Don't have time to investigate.
20b945df70