Extend temporary workaround to full cluster stop.