* Backport the important part of r8717 to stable. I forgot I did this on Friday...