Revert "Merge branch 'travis' into provider"

This reverts commit 1ba58432ac2425d08976c360e3a3d558d69780fd, reversing
changes made to 0c163e00074c0afe21715515652e63c6790030cc.
Revert "Merge branch 'travis' into provider"

This reverts commit 0c163e00074c0afe21715515652e63c6790030cc, reversing
changes made to 353dfe7b3aab8c28370e48231fe09a4dd60f62e8.