hm... john's comment on that ticket is interesting: applying this diff is sufficient to cause the hang: