Re-^6 fix building on travis-ci.