We currently have our baked audit logic, which was upstreamed some time ago. Should switch to use it instead.