Attempting to avoid our Travis build errors.  See comments in issue #478 for more details