Merge "Revert "Fix race in CommitCodeInternal and cleanup""