Fixes bug where current_blog state is not restored