Discarded upgrade for now, it seems to remove the panel and I don't
haev the time to investigate on that right now.