Fix #612: Bring travis build back to a stable state