Revert "Break big lock into some tiny locks" Upstream-commit: 9365b301a821a95e36589c990a36ea4c619b9ba1 Component: engine