And revert some further #travis