This avoids a potential bug with regards to not returning the prefix that the uplink expects. Change-Id: I64683db57c5b22989db91b4f8e08530bf3b64ff1