Reestablish ABI compatibility broken with #260