Another fix for dupe timestamp bug

Prevent the duplication on recieving the messages, as trying it on sending
was futile as the messages were being handled on different threads at
EXACTLY the same time. Remove that old code.

Change-Id: I304e2260d93b744aa09a4dcd2a0f57d32678f4d0
Merge "Another fix for dupe timestamp bug"