Seems like an un-necessary if statement Upstream-commit: 5035fa1e21947bfd229639c5c83c89d6bda0a1a9 Component: engine