This is an alternate solution to the problem described in #19969. Signed-off-by: Ross Boucher <rboucher@gmail.com> Upstream-commit: d23778168d158e0813420ffc2d10fdddba6a12b6 Component: engine