r17105: Fix the race Volker found - we had a non-locked