This is needed before !68693 (merged) can be merged.
Tagging @nstyles, @jcatmore, @wlampl, @tsulaia, @tadej