Can we make this a private function, and add a `@since 0.8` to the doc?