Issue LIBCLOUD-459: Update proposed fix following wrigri feedback.