This was an unrelated fix for Travis build issues, oh well.