Everything below and above us does that already anyway, so do this here
too and ensure we aren't accidentally using obsolete API.