Revert "Fix brooklyn-client build issue"