A bit more duplication than the last commit, mostly trying to get another Travis build going to see why it's failing.