[ar7] rework multi_probe patch to be cleaner