This reverts commit 9fd02a4f11. Looks like there's some changes I missed in there and getting this in'll involve updating some other packages. Will poke it after 0.9.2.
9fd02a4f11
darcs-hash:20080930133847-5ed1f-429b4b3c6ff4f56f50e2dad19de76066589b9e05.gz