Revert "Make rescheduling of l3 agent more resilient"

This reverts commit 9f8bb531c59c5bcdb8cf7492e4496ae131f392dd.
because this commit broke deployment

Change-Id: Ie54920954c9b50375224b54b397e31df4edbc8cd
Related-Bug: #1371550
Related-Bug: #1375817