refs #6449 more careful mutexing