Refactoring ineffectual assignments Upstream-commit: 5eda0c59477a7364878351c3d311cd3a4c6dd28d Component: engine