Reverted last change, doesn't work with Travis CI