Add back the mutex protection around the size computations as they are not yet atomic operations. This commit was SVN r8812.