Remove Travic CI workaround
Merge branch 'travis-fix'