Hack to work around #19905