Cleanup: remove obsolete workaround Upstream-commit: 92c840c87de759411229e3d1ace9f8a41cba83dc Component: engine