SSDP: Missed changes when reverting [52cb0b5]