Reverting wallet2.cpp to proper bugfix