Re-^7 fix building on travis-ci.