Undo a previous change, because of the implicit lock ownership and releases. I
don't like C++...