Take fix for https://github.com/Metaswitch/sas-client/issues/23