This reverts commit 3ac68f1966222d9a1c0ff867515e3f5c2f83e422. Upstream-commit: a6e5a397bd6b7967a91f1d7cbe581e46211964da Component: engine