This reverts commit d7e2fc898284fe29ed43f7b28eae56e7e052e854. Upstream-commit: cb70eedfdad40538983f9610322262ce84e284a0 Component: engine