Revert "Lock state before we modify." Upstream-commit: c4ab4989204e41046f61f660946848d10a759a83 Component: engine