Work around sas-client issue 23 (https://github.com/Metaswitch/sas-client/issues/23)
Fix up previous hack
Tidy up commenting