cleanup: remove unneeded locks Upstream-commit: 340fd140e67901c8b5ad9d59c6fb693f6bbcffde Component: engine