This reverts commit 31eb899712. Update with a gratuitous SONAME bump that I didn't review... reverted.
31eb899712