Revert "Make rescheduling of l3 agent more resilient"

This reverts commit c0af7efa8bf992261241c53af2b6b4c534935eeb.
because this commit broke deployment

Change-Id: I2a3764d104e893222cfeb767351ae52a0ebc87f6
Related-Bug: #1371550
Related-Bug: #1375817
Merge "Revert "Make rescheduling of l3 agent more resilient""