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:20080822131714-84dde-6978424ded2ed1041a65142a25560654ac717fcd.gz