This reverts commit e52d756f40c9ccf8b37ca496cb72be057c909ed7. Upstream-commit: 72a08a5458d5d8248dec431c82241a7b18b2657b Component: engine