This reverts commit e6eff4376e.
It causes a build-breakage on the network test configuration so revert
it for now to hopefully add back after -rc2 is merged.
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I866dcc31dc3d3eb68929708d28935c5e13a7fb3d