Revert pull request #3 - it broke the build

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