Fixes #4393 Signed-off-by: Brian Goff <cpuguy83@gmail.com> Upstream-commit: c73e3bf4dc0382cd188db3e51c52eaf8bf605795 Component: engine