Issue #5: Sort-of reverted Arc-breaking change.