Bug 947931 - Remove unnecessary locking now to avoid potential for deadlock. r=botond,BenWa