reverting 2012-06-16 99.8d73279 "Fix bug #59794"
- that and all child commits seem to be segfaulting on an up-to-date Arch Linux