PIM-3057 : stabilize the "back to the grid" scenarios