Fix for TIM-449. Do not use Peer UUID