Backport no-more-locking-oopses