Revert "Fix for bonding tests"

This reverts commit 39754e7a27b89ce0f967fb9f5bd744a36616b563.

Change-Id: I73e8df47113e1a0df9eaea2a9ee946375dbf3df6
Merge "Revert "Fix for bonding tests""