Remove redundant 'if' statement Upstream-commit: 4dff5381180d25c9037175c3344902008e15e00c Component: engine