Re-^4 fix building on travis-ci.