One commit introduced after the reverted change was using an API introduced there, this is reintroducing the API, but not the original broken change.
