See TODO: Why is this public?