This doesn't need to be applied to stable, because somehow -stable seems to have gotten it right. Reviewed by: jasone