Re-work settings to fix Travis failure.