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