reverting unnecessary mutex locks from b388849652