This should fix warren's problem #1 from comment #1 at
https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=159267