stability. I believe that this change was unneeded and actually
may hurt matters by holding a lock for too long.
Partially undoes #5444 , particular commit e7042b5d