This reverts commit f4c17a202b5f6021d48c3cb3342c37607b509630. Upstream-commit: dab84f7e8bc1647f70782731e797fd827c7ce42a Component: engine
This reverts commit f4c17a202b5f6021d48c3cb3342c37607b509630. Upstream-commit: dab84f7e8bc1647f70782731e797fd827c7ce42a Component: engine