This fixes https://bugzilla.redhat.com/show_bug.cgi?id=609463 As usual for me, this series has a problem searching for a more elegant solution. See PATCH 2/2 for details. Is it too late to put this in 0.8.8? (assuming a solution to that problem, of course).