Never-ending wallet upgrade process...