Wip 8396

This version does not seem to cause valgrind problems and should also fix the 8691 lockdep problem.