Added fredlf's suggested changes. Upstream-commit: 4bcc7e283f4191d2505bc87c2eaa5a38cb15b356 Component: engine