And use it where appropriate. A public API asking you to know the internals of your code is a bad idea. (cherry picked from commit ee25bfc8)