Fix the mess after last battery polling patching