Without this, this change would get lost when backporting #70891, or would make backporting a lot harder.