Revert "DO NOT MERGE: Add safety net to prevent sync stoppage"

* The underlying bug in DPM was fixed by hackbod in
  I4ebe0ea0461222b65425b2c5438b646b572f18c8

This reverts commit 77d35cf542a1571798b9bb9dfcea448b4ef3e4c5.

Change-Id: I7c5d66df512c3ce6ecb7ed731baf5dd757e453c5
2 files changed