Revert "Fix for bonding tests"

This reverts commit ad49fdf051baa28ba8377684da59f4ebd58103aa.

Change-Id: I2dbd3177c43d717e0cf066cc15083d9f7844bf8b