Revert patch 91e03ab1a0718c6caf5a18bfc25c99d374dcc337

It broke the build.

Signed-off-by: Jon Ludlam <jonathan.ludlam@eu.citrix.com>