I think the only metrics being used in production are account metrics, so it'd be great if we get make the change the `FIXME` is talking about as part of this PR.