Taking some pointers from @tianon on my pull request #2685. Upstream-commit: 76ee860ece15f8a7738c503fdd73f124f0ef1f4b Component: engine